From: Kurt Roeckx <kurt@roeckx.be>
Date: Sun, 22 Nov 2015 09:31:35 +0000 (+0100)
Subject: Use defined(__sun) instead of defined(sun)
X-Git-Tag: OpenSSL_1_1_0-pre1~193
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d32218812e87221344f2985512e42e4aaa88745;p=oweals%2Fopenssl.git

Use defined(__sun) instead of defined(sun)

Strict ISO confirming C compilers only define __sun

Reviewed-by: Viktor Dukhovni <openssl-users@dukhovni.org>

RT #4144, MR #1353
---

diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index c37dbbacb4..70db66d667 100644
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -137,7 +137,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 4298ec1cea..fcf3af90b7 100644
--- a/e_os.h
+++ b/e_os.h
@@ -553,7 +553,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #    include <sys/select.h>
 #   endif
 
-#   if defined(sun)
+#   if defined(__sun)
 #    include <sys/filio.h>
 #   else
 #    ifndef VMS
@@ -595,7 +595,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 <stdlib.h>
 #  include <string.h>