Use both sun and __sun

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit ed02493567390cac6d07447f193fcaac5b219af3)

diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index d8e6abcf16be5e81ee6a6f87aca050d5fb2f617a..7a1c85d6ec9da07d1f64715bc689a0801c735d12 100644 (file)
--- 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 ) || 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 d84ffb446b1fa2ee01f1a59a148e941ef56c3c92..c9c7aaf1a746e41d9be2e995cfbc7bfdf4914936 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -612,7 +612,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #    include <sys/select.h>
 #   endif
 
-#   if defined(__sun)
+#   if defined(__sun) || defined(sun)
 #    include <sys/filio.h>
 #   else
 #    ifndef VMS
@@ -654,7 +654,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 
 # endif
 
-# if defined(__sun) && !defined(__svr4__) && !defined(__SVR4)
+# if (defined(__sun) || defined(sun)) && !defined(__svr4__) && !defined(__SVR4)
   /* include headers first, so our defines don't break it */
 #  include <stdlib.h>
 #  include <string.h>