diff options
| author | unknown <konstantin@mysql.com> | 2004-03-15 22:39:36 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-03-15 22:39:36 +0300 |
| commit | dc8ecc3b9e035c0646bef3a2ae594545a310a2c2 (patch) | |
| tree | ba7fc5cf4c332be3608b598166cd8dae2b856d02 /include/my_global.h | |
| parent | f4a282091dd82bb10ed1c03cb3f1b2581a64e85d (diff) | |
| download | mariadb-git-dc8ecc3b9e035c0646bef3a2ae594545a310a2c2.tar.gz | |
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
exceed unsigned long limit.
include/config-win.h:
implementation of ULL macro for Windows
include/my_global.h:
ULL macro defined: we need this macro because ULL qualifier is not defined
on systems withoug unsigned long long
sql/item_func.cc:
new ULL macro caused conflict with class for user level lock ULL.
ULL renamed to User_level_lock
sql/item_func.h:
ULL -> User_level_lock
sql/mysql_priv.h:
merge error fixed: LL defined in my_global.h
sql/mysqld.cc:
ULL macro used for long long constants to fix compilation failure on gcc 3.*
sql/sql_class.h:
ULL renamed to User_level_lock
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 8 insertions, 0 deletions
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. |