diff options
| author | msvensson@pilot.blaudden <> | 2007-04-24 13:59:44 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-24 13:59:44 +0200 |
| commit | 9bd17ef189577e4e00e9fd9a69904e62c19fad3a (patch) | |
| tree | 42c8f80f7c7f62ad29db840fd214f00005504af4 /include/my_global.h | |
| parent | 88ad41e2560d7785798ab47ce4087529282709f4 (diff) | |
| parent | 7563ebefca27494b2beaee244e0d16b7098e51de (diff) | |
| download | mariadb-git-9bd17ef189577e4e00e9fd9a69904e62c19fad3a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/include/my_global.h b/include/my_global.h index d4f9223ccac..f446c283d50 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -505,43 +505,7 @@ typedef unsigned short ushort; #define my_const_cast(A) (A) #endif -/* - 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. -*/ -#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 -# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n))) -#endif - -/* - - __attribute__((format(...))) on a function pointer is not supported - until gcc 3.1 -*/ -#ifndef ATTRIBUTE_FORMAT_FPTR -# if (GCC_VERSION >= 3001) -# define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n) -# else -# define ATTRIBUTE_FORMAT_FPTR(style, m, n) -# endif /* GNUC >= 3.1 */ -#endif +#include <my_attribute.h> /* Wen using the embedded library, users might run into link problems, |