Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rearrange tests for long long again to avoid clashes with SIZEOF_LONG_LONG defined by other packages

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-10 15:21:33 +00:00
parent ce15b45fef
commit edff6201ce
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/wx/defs.h
View File

@@ -908,20 +908,17 @@ inline void *wxUIntToPtr(wxUIntPtr p)
/* we will need to define this */ /* we will need to define this */
#undef wxLongLongIsLong #undef wxLongLongIsLong
/* first check for compilers which have the real long long */ /*
#if (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ First check for specific compilers which have known 64 bit integer types,
defined(__GNUC__) || \ this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for
defined(__CYGWIN__) || \ e.g. MSVC builds (Python.h defines it as 8 even for MSVC).
defined(__WXMICROWIN__) || \
(defined(__DJGPP__) && __DJGPP__ >= 2) Also notice that we check for "long long" before checking for 64 bit long as
#define wxLongLong_t long long we still want to use "long long" and not "long" for wxLongLong_t on 64 bit
#define wxLongLongSuffix ll architectures to be able to pass wxLongLong_t to the standard functions
#define wxLongLongFmtSpec _T("ll") prototyped as taking "long long" such as strtoll().
#elif defined(__WXPALMOS__) */
#define wxLongLong_t int64_t #if (defined(__VISUALC__) && defined(__WIN32__))
#define wxLongLongSuffix ll
#define wxLongLongFmtSpec _T("ll")
#elif (defined(__VISUALC__) && defined(__WIN32__))
#define wxLongLong_t __int64 #define wxLongLong_t __int64
#define wxLongLongSuffix i64 #define wxLongLongSuffix i64
#define wxLongLongFmtSpec _T("I64") #define wxLongLongFmtSpec _T("I64")
@@ -950,8 +947,20 @@ inline void *wxUIntToPtr(wxUIntPtr p)
#error "The 64 bit integer support in CodeWarrior has been disabled." #error "The 64 bit integer support in CodeWarrior has been disabled."
#error "See the documentation on the 'longlong' pragma." #error "See the documentation on the 'longlong' pragma."
#endif #endif
#elif defined(__WXPALMOS__)
#define wxLongLong_t int64_t
#define wxLongLongSuffix ll
#define wxLongLongFmtSpec _T("ll")
#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
#define wxLongLong_t long long #define wxLongLong_t long long
#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \
defined(__GNUC__) || \
defined(__CYGWIN__) || \
defined(__WXMICROWIN__) || \
(defined(__DJGPP__) && __DJGPP__ >= 2)
#define wxLongLong_t long long
#define wxLongLongSuffix ll
#define wxLongLongFmtSpec _T("ll")
#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
#define wxLongLong_t long #define wxLongLong_t long
#define wxLongLongSuffix l #define wxLongLongSuffix l