From 6aed1fe23142e3bf1c13666d05665f8421a8a9a0 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 13 Mar 2006 11:06:16 +0000 Subject: [PATCH] Updated. committer: mfx 1142247976 +0000 --- src/stub/linux.hh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/stub/linux.hh b/src/stub/linux.hh index 08682d5c..f1397594 100644 --- a/src/stub/linux.hh +++ b/src/stub/linux.hh @@ -31,6 +31,17 @@ // section is now completely freestanding +#if defined(__GNUC__) +# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) +# define ACC_CC_GNUC (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__) +# elif defined(__GNUC_MINOR__) +# define ACC_CC_GNUC (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100) +# else +# define ACC_CC_GNUC (__GNUC__ * 0x10000L) +# endif +#endif + + /************************************************************************* // **************************************************************************/ @@ -43,7 +54,7 @@ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef int int32_t; typedef unsigned uint32_t; -#if defined(__GNUC__) && (__GNUC__ >= 3) +#if (ACC_CC_GNUC >= 0x020800ul) __extension__ typedef long long int64_t; __extension__ typedef unsigned long long uint64_t; #elif defined(_WIN32) @@ -549,16 +560,6 @@ struct p_info // 12-byte packed program header follows stub loader ((type) ((uintptr_t) (var))) -#if defined(__GNUC__) -# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) -# define ACC_CC_GNUC (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__) -# elif defined(__GNUC_MINOR__) -# define ACC_CC_GNUC (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100) -# else -# define ACC_CC_GNUC (__GNUC__ * 0x10000L) -# endif -#endif - #if (ACC_CC_GNUC >= 0x030300) # define __attribute_cdecl __attribute__((__cdecl__, __used__)) #elif (ACC_CC_GNUC >= 0x020700)