diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:13:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:38:33 +0100 |
| commit | 0cee740c95496210d62206a21e8bc9adebf4fa4d (patch) | |
| tree | 4a1ff295046962418b30ac244314dfee5fb92fb5 /external | |
| parent | b170265a6bba70faf1cb4172834586f4f45dd2bf (diff) | |
replace #ifdef SOLARIS with #ifdef __sun
Check for a macro that is defined by the compiler, we don't really need
one defined by the build system.
Change-Id: Iccb8e3198396881395c97a6b81690ebe64b7e9d2
Diffstat (limited to 'external')
| -rw-r--r-- | external/jpeg/configs/jconfig.h | 2 | ||||
| -rw-r--r-- | external/mysqlcppconn/config.h | 2 | ||||
| -rw-r--r-- | external/neon/configs/config.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/external/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h index 1ac8ea9e5daf..bb8aa9edbc7b 100644 --- a/external/jpeg/configs/jconfig.h +++ b/external/jpeg/configs/jconfig.h @@ -37,7 +37,7 @@ typedef unsigned char boolean; /* #undef RIGHT_SHIFT_IS_UNSIGNED */ #ifdef _WIN32 #define INLINE __inline -#elif defined SOLARIS +#elif defined __sun #define INLINE #else #define INLINE inline diff --git a/external/mysqlcppconn/config.h b/external/mysqlcppconn/config.h index 7736c611f7be..cad5b6786ed8 100644 --- a/external/mysqlcppconn/config.h +++ b/external/mysqlcppconn/config.h @@ -6,7 +6,7 @@ #define HAVE_FUNCTION_STRTOL 1 #define HAVE_FUNCTION_STRTOULL 1 -#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX) || (defined _MSC_VER && _MSC_VER >= 1600) +#if defined(MACOSX) || defined(__sun) || defined(LINUX) || (defined _MSC_VER && _MSC_VER >= 1600) #define HAVE_STDINT_H #ifndef _MSC_VER #define HAVE_INTTYPES_H diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index 996f74412af2..a2e0c8d9e4bc 100644 --- a/external/neon/configs/config.h +++ b/external/neon/configs/config.h @@ -488,7 +488,7 @@ /* #undef SIZEOF_XML_SIZE */ /* Define to 1 if you have the ANSI C header files. */ -#ifdef SOLARIS +#ifdef __sun #define STDC_HEADERS 1 #endif @@ -530,7 +530,7 @@ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined (SOLARIS) && defined (SPARC) +#if defined (__sun) && defined (SPARC) #define WORDS_BIGENDIAN 1 #endif @@ -556,7 +556,7 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -#if defined (SOLARIS) && defined (__SUNPRO_C) +#if defined (__sun) && defined (__SUNPRO_C) #define inline #endif #endif |