mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51 include/my_global.h: Auto merged
This commit is contained in:
commit
fb6c45ebf8
1 changed files with 1 additions and 1 deletions
|
@ -565,7 +565,7 @@ typedef unsigned short ushort;
|
|||
# define __attribute__(A)
|
||||
# elif GCC_VERSION < 2008
|
||||
# define __attribute__(A)
|
||||
# elif defined(__cplusplus__) && GCC_VERSION < 3004
|
||||
# elif defined(__cplusplus) && GCC_VERSION < 3004
|
||||
# define __attribute__(A)
|
||||
# endif
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue