diff options
| author | Mumit Khan <khan@@xraylith.wisc.edu> | 2000-02-29 03:16:14 +0000 |
|---|---|---|
| committer | Mumit Khan <khan@@xraylith.wisc.edu> | 2000-02-29 03:16:14 +0000 |
| commit | adbc0b0aa7e522b4a9302c082547e7bd889d0953 (patch) | |
| tree | ddbff99e3b1f10c155c951f7572e9e2cb313c6cf | |
| parent | 1756811b9923dcfef575a79e0ff6a45664520773 (diff) | |
| download | cygnal-adbc0b0aa7e522b4a9302c082547e7bd889d0953.tar.gz cygnal-adbc0b0aa7e522b4a9302c082547e7bd889d0953.tar.bz2 cygnal-adbc0b0aa7e522b4a9302c082547e7bd889d0953.zip | |
2000-02-28 Mumit Khan <khan@xraylith.wisc.edu>
* include/largeint.h: Rename HAVE_INT64 macro to _HAVE_INT64 to avoid
namespace pollution.
* include/rpcndr.h: Likewise.
* include/winnt.h: Likewise.
| -rw-r--r-- | winsup/w32api/include/largeint.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/rpcndr.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/winsup/w32api/include/largeint.h b/winsup/w32api/include/largeint.h index 1e90de07d..c36db31ef 100644 --- a/winsup/w32api/include/largeint.h +++ b/winsup/w32api/include/largeint.h @@ -13,7 +13,7 @@ extern "C" { #endif -#ifdef HAVE_INT64 +#ifdef _HAVE_INT64 #define _toi (__int64) #define _toui (unsigned __int64) #else diff --git a/winsup/w32api/include/rpcndr.h b/winsup/w32api/include/rpcndr.h index 8b6c37b45..8d8bd0d57 100644 --- a/winsup/w32api/include/rpcndr.h +++ b/winsup/w32api/include/rpcndr.h @@ -32,7 +32,7 @@ extern "C" { #define __MIDL_DECLSPEC_DLLIMPORT #define __MIDL_DECLSPEC_DLLEXPORT #endif -#if defined(HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) +#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) #define hyper __int64 #define MIDL_uhyper unsigned __int64 #else diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 4574136d2..7f08e2810 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -99,12 +99,12 @@ typedef DWORD LCID; typedef PDWORD PLCID; typedef WORD LANGID; #ifdef __GNUC__ -#define HAVE_INT64 +#define _HAVE_INT64 #define _INTEGRAL_MAX_BITS 64 #undef __int64 #define __int64 long long #endif -#if defined(HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) +#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) typedef __int64 LONGLONG; typedef unsigned __int64 DWORDLONG; #else @@ -114,7 +114,7 @@ typedef LONGLONG *PLONGLONG; typedef DWORDLONG *PDWORDLONG; typedef DWORDLONG ULONGLONG,*PULONGLONG; typedef LONGLONG USN; -#ifdef HAVE_INT64 +#ifdef _HAVE_INT64 #define Int32x32To64(a,b) ((LONGLONG)(a)*(LONGLONG)(b)) #define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b)) #define Int64ShllMod32(a,b) ((DWORDLONG)(a)<<(b)) |