JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2000-02-28 Mumit Khan <khan@xraylith.wisc.edu>

Browse Source 
* include/largeint.h: Rename HAVE_INT64 macro to _HAVE_INT64 to avoid
	namespace pollution.
	* include/rpcndr.h: Likewise.
	* include/winnt.h: Likewise.
This commit is contained in:
Mumit Khan 2000-02-29 03:16:14 +00:00
parent 1756811b99
commit adbc0b0aa7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/w32api/include/largeint.h
View File

@ -13,7 +13,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef HAVE_INT64 #ifdef _HAVE_INT64
#define _toi (__int64) #define _toi (__int64)
#define _toui (unsigned __int64) #define _toui (unsigned __int64)
#else #else

2
winsup/w32api/include/rpcndr.h
View File

@ -32,7 +32,7 @@ extern "C" {
#define __MIDL_DECLSPEC_DLLIMPORT #define __MIDL_DECLSPEC_DLLIMPORT
#define __MIDL_DECLSPEC_DLLEXPORT #define __MIDL_DECLSPEC_DLLEXPORT
#endif #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 hyper __int64
#define MIDL_uhyper unsigned __int64 #define MIDL_uhyper unsigned __int64
#else #else

6
winsup/w32api/include/winnt.h
View File

@ -99,12 +99,12 @@ typedef DWORD LCID;
typedef PDWORD PLCID; typedef PDWORD PLCID;
typedef WORD LANGID; typedef WORD LANGID;
#ifdef __GNUC__ #ifdef __GNUC__
#define HAVE_INT64 #define _HAVE_INT64
#define _INTEGRAL_MAX_BITS 64 #define _INTEGRAL_MAX_BITS 64
#undef __int64 #undef __int64
#define __int64 long long #define __int64 long long
#endif #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 __int64 LONGLONG;
typedef unsigned __int64 DWORDLONG; typedef unsigned __int64 DWORDLONG;
#else #else
@ -114,7 +114,7 @@ typedef LONGLONG *PLONGLONG;
typedef DWORDLONG *PDWORDLONG; typedef DWORDLONG *PDWORDLONG;
typedef DWORDLONG ULONGLONG,*PULONGLONG; typedef DWORDLONG ULONGLONG,*PULONGLONG;
typedef LONGLONG USN; typedef LONGLONG USN;
#ifdef HAVE_INT64 #ifdef _HAVE_INT64
#define Int32x32To64(a,b) ((LONGLONG)(a)*(LONGLONG)(b)) #define Int32x32To64(a,b) ((LONGLONG)(a)*(LONGLONG)(b))
#define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b)) #define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b))
#define Int64ShllMod32(a,b) ((DWORDLONG)(a)<<(b)) #define Int64ShllMod32(a,b) ((DWORDLONG)(a)<<(b))