From f5fadf1016be1efdf91b1ff5c3323df54a101382 Mon Sep 17 00:00:00 2001 From: Richard PALO Date: Sat, 21 Nov 2015 06:57:09 +0100 Subject: [PATCH] tools/build convert sun=>__sun for strict ISO compilers Signed-off-by: Richard PALO --- src/engine/boehm_gc/include/gc_config_macros.h | 2 +- src/engine/boehm_gc/include/private/gcconfig.h | 10 +++++----- src/engine/jam.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/boehm_gc/include/gc_config_macros.h b/src/engine/boehm_gc/include/gc_config_macros.h index 762162a..21d870f 100644 --- a/src/engine/boehm_gc/include/gc_config_macros.h +++ b/src/engine/boehm_gc/include/gc_config_macros.h @@ -95,7 +95,7 @@ # define GC_PTHREADS # endif # if defined(__sparc) && !defined(__linux__) \ - || defined(sun) && (defined(i386) || defined(__i386__)) + || defined(__sun) && (defined(i386) || defined(__i386__)) # define GC_SOLARIS_THREADS # define GC_PTHREADS # endif diff --git a/src/engine/boehm_gc/include/private/gcconfig.h b/src/engine/boehm_gc/include/private/gcconfig.h index 61cf9ea..be54b6b 100644 --- a/src/engine/boehm_gc/include/private/gcconfig.h +++ b/src/engine/boehm_gc/include/private/gcconfig.h @@ -69,7 +69,7 @@ # define mach_type_known # endif # endif -# if defined(sun) && defined(mc68000) +# if defined(__sun) && defined(mc68000) # error SUNOS4 no longer supported # endif # if defined(hp9000s300) @@ -141,12 +141,12 @@ # define SEQUENT # define mach_type_known # endif -# if defined(sun) && (defined(i386) || defined(__i386__)) +# if defined(__sun) && (defined(i386) || defined(__i386__)) # define I386 # define SOLARIS # define mach_type_known # endif -# if defined(sun) && defined(__amd64) +# if defined(__sun) && defined(__amd64) # define X86_64 # define SOLARIS # define mach_type_known @@ -159,14 +159,14 @@ # if defined(ibm032) # error IBM PC/RT no longer supported. # endif -# if defined(sun) && (defined(sparc) || defined(__sparc)) +# if defined(__sun) && (defined(sparc) || defined(__sparc)) # define SPARC /* Test for SunOS 5.x */ # include # define SOLARIS # define mach_type_known # endif -# if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \ +# if defined(sparc) && defined(unix) && !defined(__sun) && !defined(linux) \ && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) \ && !defined(__DragonFly__) # define SPARC diff --git a/src/engine/jam.h b/src/engine/jam.h index b9d415e..db3a37f 100644 --- a/src/engine/jam.h +++ b/src/engine/jam.h @@ -257,7 +257,7 @@ #define OSMINOR "OS=SINIX" #define OS_SINIX #endif -#ifdef sun +#ifdef __sun #if defined(__svr4__) || defined(__SVR4) #define OSMINOR "OS=SOLARIS" #define OS_SOLARIS -- 2.6.3