diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-27 13:37:20 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-12-27 13:38:15 +0200 |
| commit | d72a0b5c618a37b70ba4d111b457deefad8f025f (patch) | |
| tree | 6b6d3c900397d34a73cde2ef0053a4c6154869c1 /sal | |
| parent | c318f3b0224a57102614be0efec4b49c80a3aa82 (diff) | |
Check for __GNUC__ instead of GCC in sources
We still have checks for $(COM) being GCC or MSC in makefiles, of
course. But there is no reason to pass -D$(COM) to compilations.
Checking the built-in compiler-specific macros __GNUC__, _MSC_VER
(etc) is the right thing to do.
Change-Id: Ia961a29ba74e2c4977e5300a92318f38104c6592
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/detail/log.h | 2 | ||||
| -rw-r--r-- | sal/osl/unx/interlck.c | 2 | ||||
| -rw-r--r-- | sal/osl/unx/util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h index 849c0b78f73c..b7e5006658f2 100644 --- a/sal/inc/sal/detail/log.h +++ b/sal/inc/sal/detail/log.h @@ -80,7 +80,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat( enum sal_detail_LogLevel level, char const * area, char const * where, char const * format, ...) /* TODO: enabling this will produce a huge amount of -Werror=format errors: */ -#if defined GCC && 0 +#if defined __GNUC__ && 0 __attribute__((format(printf, 4, 5))) #endif ; diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c index 4de4564356db..d05827eaee81 100644 --- a/sal/osl/unx/interlck.c +++ b/sal/osl/unx/interlck.c @@ -27,7 +27,7 @@ #error please use asm/interlck_sparc.s #elif defined ( SOLARIS) && defined ( X86 ) #error please use asm/interlck_x86.s -#elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) ) +#elif defined ( __GNUC__ ) && ( defined ( X86 ) || defined ( X86_64 ) ) /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */ extern int osl_isSingleCPU; diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index cd8bc9af3353..dca2963d8dba 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -259,7 +259,7 @@ void osl_InitSparcV9(void) #endif /* SOLARIS */ -#if defined(NETBSD) && defined(GCC) && !defined(__sparcv9) && !defined(__sparc_v9__) +#if defined(NETBSD) && defined(__GNUC__) && !defined(__sparcv9) && !defined(__sparc_v9__) #include <sys/param.h> #include <sys/sysctl.h> |