mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse source 
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
This commit is contained in:
tsmith/tim@siva.hindu.god 2006-09-30 01:22:34 -06:00
commit 4b56f9a6f7
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/my_global.h
View file

@ -555,23 +555,28 @@ typedef unsigned short ushort;
#endif
/*
Disable __attribute__() on GCC < 2.7 and non-GCC compilers
Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
Some forms of __attribute__ are actually supported in earlier versions of
g++, but we just disable them all because we only use them to generate
compilation warnings.
*/
#if !defined(__attribute__) && (!defined(__GNUC__) || GCC_VERSION < 2007)
#define __attribute__(A)
#ifndef __attribute__
# if !defined(__GNUC__)
# define __attribute__(A)
# elif GCC_VERSION < 2008
# define __attribute__(A)
# elif defined(__cplusplus__) && GCC_VERSION < 3004
# define __attribute__(A)
# endif
#endif
/*
__attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
But that's already covered by the __attribute__ tests above, so this is
just a convenience macro.
*/
#ifndef ATTRIBUTE_FORMAT
# if defined(__GNUC__) && \
((!defined(__cplusplus__) && GCC_VERSION >= 2008) || \
GCC_VERSION >= 3004)
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
# else
# define ATTRIBUTE_FORMAT(style, m, n)
# endif
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
#endif
/*