From fb92839c93c7efc3687fe895e631be57dec3e37f Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Sun, 22 Nov 2015 10:31:35 +0100 Subject: [PATCH] Use defined(__sun) instead of defined(sun) Strict ISO confirming C compilers only define __sun Reviewed-by: Viktor Dukhovni RT #4144, MR #1353 (cherry picked from commit 3d32218812e87221344f2985512e42e4aaa88745) --- crypto/opensslconf.h.in | 2 +- e_os.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in index 814309becb..d8e6abcf16 100644 --- a/crypto/opensslconf.h.in +++ b/crypto/opensslconf.h.in @@ -120,7 +120,7 @@ optimization options. Older Sparc's work better with only UNROLL, but there's no way to tell at compile time what it is you're running on */ -#if defined( sun ) /* Newer Sparc's */ +#if defined( __sun ) /* Newer Sparc's */ # define DES_PTR # define DES_RISC1 # define DES_UNROLL diff --git a/e_os.h b/e_os.h index 45fef691a0..8ac36735d8 100644 --- a/e_os.h +++ b/e_os.h @@ -619,7 +619,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); # include # endif -# if defined(sun) +# if defined(__sun) # include # else # ifndef VMS @@ -661,7 +661,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); # endif -# if defined(sun) && !defined(__svr4__) && !defined(__SVR4) +# if defined(__sun) && !defined(__svr4__) && !defined(__SVR4) /* include headers first, so our defines don't break it */ # include # include -- 2.25.1