Commit 5d6d3f40 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

parents 59301c14 ca3d54e1
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -563,6 +563,9 @@ typedef unsigned short ushort;
#ifndef __attribute__
# if !defined(__GNUC__)
#  define __attribute__(A)
# elif defined (__QNXNTO__)
   /* qcc defines GNUC */
#  define __attribute__(A)
# elif GCC_VERSION < 2008
#  define __attribute__(A)
# elif defined(__cplusplus) && GCC_VERSION < 3004