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.
This commit is contained in:
parent
1756811b99
commit
adbc0b0aa7
|
@ -13,7 +13,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_INT64
|
||||
#ifdef _HAVE_INT64
|
||||
#define _toi (__int64)
|
||||
#define _toui (unsigned __int64)
|
||||
#else
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue