diff options
author | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-06-23 09:03:03 +0500 |
---|---|---|
committer | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-06-23 09:03:03 +0500 |
commit | 20fd3933ce2b2af946665a00e32d2d300757433c (patch) | |
tree | 216dfddb10217f8d1821379f7daf5f7d0b763465 /include | |
parent | a197a9aa8ad569805bbbbab79cd0f87a4a11594e (diff) | |
parent | d82d6c08fdeed267de78cca1d66af6f04eb4f25b (diff) | |
download | mariadb-git-20fd3933ce2b2af946665a00e32d2d300757433c.tar.gz |
Merge mysql.com:/home/ram/work/b29079/b29079.5.0
into mysql.com:/home/ram/work/b29079/b29079.5.1
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 d6f331019f6..30fa2aba41b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -968,7 +968,12 @@ typedef unsigned long uint32; 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 |