diff options
| author | monty@mysql.com <> | 2003-12-17 17:35:34 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-17 17:35:34 +0200 |
| commit | e0cc6799ecc831d296c568c5068947c1421fcaa5 (patch) | |
| tree | 93924b5aab311e02a0f0931cf91e67cdfad04bdf /include/my_global.h | |
| parent | 0462f48b344633c7d88d12d9667f4bd50b91c552 (diff) | |
| parent | 30e318311b35b109d230f7184fe0be1b6e29f02b (diff) | |
| download | mariadb-git-e0cc6799ecc831d296c568c5068947c1421fcaa5.tar.gz | |
Merge with 4.0.17
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index b5b78774e91..9529cbee62c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -287,6 +287,9 @@ C_MODE_END #endif #ifdef HAVE_ATOMIC_ADD #define __SMP__ +#ifdef HAVE_LINUX_CONFIG_H +#include <linux/config.h> /* May define CONFIG_SMP */ +#endif #ifndef CONFIG_SMP #define CONFIG_SMP #endif @@ -626,11 +629,26 @@ extern double my_atof(const char*); #define HAVE_LONG_LONG 1 #endif +/* + Some pre-ANSI-C99 systems like AIX 5.1 and Linux/GCC 2.95 define + ULONGLONG_MAX, LONGLONG_MIN, LONGLONG_MAX; we use them if they're defined. + Also on Windows we define these constants by hand in config-win.h. +*/ + #if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN) #define LONGLONG_MIN ((long long) 0x8000000000000000LL) #define LONGLONG_MAX ((long long) 0x7FFFFFFFFFFFFFFFLL) #endif +#if defined(HAVE_LONG_LONG) && !defined(ULONGLONG_MAX) +/* First check for ANSI C99 definition: */ +#ifdef ULLONG_MAX +#define ULONGLONG_MAX ULLONG_MAX +#else +#define ULONGLONG_MAX ((unsigned long long)(~0ULL)) +#endif +#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/ + #if SIZEOF_LONG == 4 #define INT_MIN32 (long) 0x80000000L #define INT_MAX32 (long) 0x7FFFFFFFL |