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
This commit is contained in:
commit
2ad12c7819
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user