diff options
| author | konstantin@mysql.com <> | 2004-03-15 22:39:36 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-03-15 22:39:36 +0300 |
| commit | 36120d420a56c336a4fbf3069d91455e4118798b (patch) | |
| tree | ba7fc5cf4c332be3608b598166cd8dae2b856d02 /include | |
| parent | e43ac76094dbab6551aed0ffb41186d80a15b1ca (diff) | |
| download | mariadb-git-36120d420a56c336a4fbf3069d91455e4118798b.tar.gz | |
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
exceed unsigned long limit.
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index abc1aa7a6ee..518f445861a 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -95,6 +95,7 @@ functions */ #define LONGLONG_MAX ((__int64) 0x7FFFFFFFFFFFFFFF) #define ULONGLONG_MAX ((unsigned __int64) 0xFFFFFFFFFFFFFFFF) #define LL(A) ((__int64) A) +#define ULL(A) ((unsigned __int64) A) /* Type information */ diff --git a/include/my_global.h b/include/my_global.h index 2a82173979d..4a56741ddbc 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -842,6 +842,14 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #endif #endif +#ifndef ULL +#ifdef HAVE_LONG_LONG +#define ULL(A) A ## ULL +#else +#define ULL(A) A ## UL +#endif +#endif + /* Defines to make it possible to prioritize register assignments. No longer that important with modern compilers. |