diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-06-23 08:56:53 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-06-23 08:56:53 +0500 |
| commit | 2ad12c78192109ff38b86feba0f6606afc9ff8ef (patch) | |
| tree | b69270f208c88b4f4bbac62f82aedc9f50f82c3b /include | |
| parent | bfc61f2ea961aa2ce9af4d047a616978e26e2913 (diff) | |
| parent | ae587cfb0c810a1ea09cc343e4a6d58cf0984985 (diff) | |
| download | mariadb-git-2ad12c78192109ff38b86feba0f6606afc9ff8ef.tar.gz | |
Merge mysql.com:/home/ram/work/b29079/b29079.4.1
into mysql.com:/home/ram/work/b29079/b29079.5.0
include/my_global.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index f32a987ffb1..81dde581237 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -895,7 +895,12 @@ typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */ typedef unsigned long ulong; /* Short for unsigned long */ #endif #ifndef longlong_defined -#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8 +/* + Using [unsigned] long long is preferable as [u]longlong because we use + [unsigned] long long unconditionally in many places, + for example in constants with [U]LL suffix. +*/ +#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8 typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ typedef long long int longlong; #else |