diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-02 18:46:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-02 18:46:41 +0200 |
| commit | 60dc71eb95dbf4e4e524050bad95d5aab746c24c (patch) | |
| tree | 8131d8c937be197a7efd2606288fe554f3cb4a17 /include/my_global.h | |
| parent | afc1f9f83a3dbc870c690b49d8645609ae6aa92a (diff) | |
| parent | c71ecd928fcf85428dc2f51d0bb227c82bb6417c (diff) | |
| download | mariadb-git-60dc71eb95dbf4e4e524050bad95d5aab746c24c.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
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
mysql-test/t/ctype_utf8.test:
Manual merge
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'include/my_global.h')
| -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 2532be25fc1..b30e687cfd2 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -471,6 +471,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 |