Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint

into  mysql.com:/home/ram/work/b29079/b29079.4.1
This commit is contained in:
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 2007-06-23 09:23:49 +05:00
commit 06eb3e2881

View file

@ -828,7 +828,12 @@ error "Neither int or long is of 4 bytes width"
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