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 /include | |
| 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 'include')
| -rw-r--r-- | include/osl/endian.h | 2 | ||||
| -rw-r--r-- | include/sal/alloca.h | 2 | ||||
| -rw-r--r-- | include/sal/config.h | 2 | ||||
| -rw-r--r-- | include/sal/mathconf.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/osl/endian.h b/include/osl/endian.h index ebc48541230b..ca3640b8d4a5 100644 --- a/include/osl/endian.h +++ b/include/osl/endian.h @@ -65,7 +65,7 @@ extern "C" { # elif BYTE_ORDER == BIG_ENDIAN # define OSL_BIGENDIAN # endif -#elif defined SOLARIS +#elif defined __sun # include <sys/isa_defs.h> # if defined _LITTLE_ENDIAN # define OSL_LITENDIAN diff --git a/include/sal/alloca.h b/include/sal/alloca.h index ad4f512f7ff0..4a817c7ec87a 100644 --- a/include/sal/alloca.h +++ b/include/sal/alloca.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (SOLARIS) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(EMSCRIPTEN) +#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(EMSCRIPTEN) #ifndef INCLUDED_ALLOCA_H #include <alloca.h> diff --git a/include/sal/config.h b/include/sal/config.h index 9388de9155a5..a363b1922533 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -53,7 +53,7 @@ #endif /* defined WIN32 */ -#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ +#if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) #define SAL_UNX #define SAL_DLLEXTENSION ".so" diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h index 5ef63221f67d..4b977f5bb4f4 100644 --- a/include/sal/mathconf.h +++ b/include/sal/mathconf.h @@ -24,9 +24,9 @@ #include <float.h> -#if defined SOLARIS +#if defined __sun #include <ieeefp.h> -#endif /* SOLARIS */ +#endif /* __sun */ #if defined(__cplusplus) && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L ) #include <cmath> @@ -62,7 +62,7 @@ extern "C" { /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */ -#if !defined SOLARIS && !defined ANDROID \ +#if !defined __sun && !defined ANDROID \ && defined(__cplusplus) \ && ( defined(__GXX_EXPERIMENTAL_CXX0X__) \ || __cplusplus >= 201103L \ |