diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-02 23:08:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-02 23:08:30 +0200 |
| commit | ca3d54e1f3bfa683203a98b0a59c2722ff3f03bb (patch) | |
| tree | c984a4086da85d6197b6444468565d3f9d7c64e5 /include | |
| parent | f41cd19207ea71cd233cfc7f64c064c1bf63da06 (diff) | |
| parent | 60dc71eb95dbf4e4e524050bad95d5aab746c24c (diff) | |
| download | mariadb-git-ca3d54e1f3bfa683203a98b0a59c2722ff3f03bb.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 404c413f777..579379e7506 100644 --- 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 |