diff options
| author | Alexander Bergmann <myaddons@gmx.de> | 2012-02-09 13:15:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-13 17:33:15 +0000 |
| commit | 8963cc01f5267f3afc4e4a4ff5a65a67520f447b (patch) | |
| tree | c1f058310dd7ac12ddc0546c5bd3f8fcdbbd1ab8 /np_sdk | |
| parent | bbeb0f7a82945e8d7b98e5d5da9f69dfc5c6fabe (diff) | |
EasyHack: Removed gcc conditionals
Diffstat (limited to 'np_sdk')
| -rw-r--r-- | np_sdk/inc/npapi.h | 2 | ||||
| -rw-r--r-- | np_sdk/inc/npfunctions.h | 3 | ||||
| -rw-r--r-- | np_sdk/inc/nptypes.h | 10 |
3 files changed, 2 insertions, 13 deletions
diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h index d67dcd3c35d4..7db99814b73a 100644 --- a/np_sdk/inc/npapi.h +++ b/np_sdk/inc/npapi.h @@ -310,7 +310,7 @@ typedef enum { * gcc 3.x generated vtables on UNIX and OSX are incompatible with * previous compilers. */ -#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3)) +#if defined(XP_UNIX) && defined(__GNUC__) #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK #else #define _NP_ABI_MIXIN_FOR_GCC3 0 diff --git a/np_sdk/inc/npfunctions.h b/np_sdk/inc/npfunctions.h index abc14733a2c2..90faa3ce171d 100644 --- a/np_sdk/inc/npfunctions.h +++ b/np_sdk/inc/npfunctions.h @@ -247,8 +247,7 @@ typedef OSErr (*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32); #endif #if defined(XP_UNIX) -/* GCC 3.3 and later support the visibility attribute. */ -#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +#if defined(__GNUC__) #define NP_VISIBILITY_DEFAULT __attribute__((visibility("default"))) #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) #define NP_VISIBILITY_DEFAULT __global diff --git a/np_sdk/inc/nptypes.h b/np_sdk/inc/nptypes.h index 300128885cc3..d5faf5f4921c 100644 --- a/np_sdk/inc/nptypes.h +++ b/np_sdk/inc/nptypes.h @@ -104,17 +104,7 @@ #include <stdint.h> #ifndef __cplusplus - #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95) #include <stdbool.h> - #else - /* - * GCC 2.91 can't deal with a typedef for bool, but a #define - * works. - */ - #define bool int - #define true 1 - #define false 0 - #endif #endif #endif |