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

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

Merge bk-internal:/home/bk/mysql-5.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
7f21400c · msvensson@neptunus.(none) · 5b491de2 · 3da45a6d · 7f21400c
Commit 7f21400c authored Oct 03, 2006 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

include/my_global.h include/my_global.h +3 -0

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -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