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.

diff --git a/winsup/w32api/include/largeint.h b/winsup/w32api/include/largeint.h
index 1e90de0..c36db31 100644 (file)
--- 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 8b6c37b..8d8bd0d 100644 (file)
--- 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 4574136..7f08e28 100644 (file)
--- 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))