diff options
| author | serg@serg.mylan <> | 2004-08-20 00:52:43 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-08-20 00:52:43 +0200 |
| commit | 62722e7b0528a97ef0b5831cb27c1acfd4d5e856 (patch) | |
| tree | 5fff92365d8baf56b0bfb2391843398321d56ee2 /include | |
| parent | 22546845f2651074cff2d48aa708365f40c1cfa9 (diff) | |
| parent | 068a57b12c46b15dd9e8192fe0fb0def468eb5ab (diff) | |
| download | mariadb-git-62722e7b0528a97ef0b5831cb27c1acfd4d5e856.tar.gz | |
merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/include/my_global.h b/include/my_global.h index a9ca5416c88..89a5363dc4b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -644,29 +644,17 @@ typedef SOCKET_SIZE_TYPE size_socket; #endif #endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/ -#if SIZEOF_LONG == 4 -#define INT_MIN32 ((long) 0x80000000L) -#define INT_MAX32 ((long) 0x7FFFFFFFL) -#define UINT_MAX32 ((long) 0xFFFFFFFFL) -#define INT_MIN24 ((long) 0xFF800000L) -#define INT_MAX24 0x007FFFFFL -#define UINT_MAX24 0x00FFFFFFL -#define INT_MIN16 ((short int) 0x8000) +#define INT_MIN32 (~0x7FFFFFFFL) +#define INT_MAX32 0x7FFFFFFFL +#define UINT_MAX32 0xFFFFFFFFL +#define INT_MIN24 (~0x007FFFFF) +#define INT_MAX24 0x007FFFFF +#define UINT_MAX24 0x00FFFFFF +#define INT_MIN16 (~0x7FFF) #define INT_MAX16 0x7FFF #define UINT_MAX16 0xFFFF -#define INT_MIN8 ((char) 0x80) -#define INT_MAX8 ((char) 0x7F) -#else /* Probably Alpha */ -#define INT_MIN32 ((long) (int) 0x80000000) -#define INT_MAX32 ((long) (int) 0x7FFFFFFF) -#define UINT_MAX32 ((long) (int) 0xFFFFFFFF) -#define INT_MIN24 ((long) (int) 0xFF800000) -#define INT_MAX24 ((long) (int) 0x007FFFFF) -#define UINT_MAX24 ((long) (int) 0x00FFFFFF) -#define INT_MIN16 ((short int) 0xFFFF8000) -#define INT_MAX16 ((short int) 0x00007FFF) -#define UINT_MAX16 ((short int) 0x0000FFFF) -#endif +#define INT_MIN8 (~0x7F) +#define INT_MAX8 0x7F /* From limits.h instead */ #ifndef DBL_MIN |