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

safer definitions for wx(U)Int32,16 (taken from intl.cpp)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-15 23:28:42 +00:00
parent 563d535e46
commit 988a8d440e
1 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/wx/defs.h
View File

@@ -468,17 +468,43 @@ enum
#define wxInt8 char signed #define wxInt8 char signed
#define wxUint8 char unsigned #define wxUint8 char unsigned
#if defined(__WIN16__) || (defined(SIZEOF_INT) && (SIZEOF_INT == 2)) #ifdef __WINDOWS__
#define wxInt16 int signed #if defined(__WIN16__)
#define wxUint16 int unsigned #define wxInt16 int signed
#define wxInt32 long signed #define wxUint16 int unsigned
#define wxUint32 long unsigned #define wxInt32 long signed
#else #define wxUint32 long unsigned
#define wxInt16 short signed #elif defined(__WIN32__)
#define wxUint16 short unsigned #define wxInt16 short signed
#define wxInt32 int signed #define wxUint16 short unsigned
#define wxUint32 int unsigned #define wxInt32 int signed
#endif #define wxUint32 int unsigned
#else
// Win64 will have different type sizes
#error "Please define a 32 bit type"
#endif
#else // !Windows
// SIZEOF_XXX are defined by configure
#if defined(SIZEOF_INT) && (SIZEOF_INT == 4)
#define wxInt16 short signed
#define wxUint16 short unsigned
#define wxInt32 int signed
#define wxUint32 int unsigned
#elif defined(SIZEOF_INT) && (SIZEOF_INT == 2)
#define wxInt16 int signed
#define wxUint16 int unsigned
#define wxInt32 long signed
#define wxUint32 long unsigned
#else
// assume sizeof(int) == 4 - what else can we do
wxCOMPILE_TIME_ASSERT( sizeof(int) == 4, IntMustBeExactly4Bytes);
#define wxInt16 short signed
#define wxUint16 short unsigned
#define wxInt32 int signed
#define wxUint32 int unsigned
#endif
#endif // Win/!Win
#if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
#define wxInt64 long signed #define wxInt64 long signed