[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Kurt Roeckx]

The branch OpenSSL_1_0_1-stable has been updated
       via  98b94544e5dcab065404de1892d2aeb726dd6491 (commit)
      from  844de56ed6e96042d364da6020bd29a816293a0a (commit)


- Log -----------------------------------------------------------------
commit 98b94544e5dcab065404de1892d2aeb726dd6491
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Nov 24 23:21:06 2015 +0100

    Use both sun and __sun
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit ed02493567390cac6d07447f193fcaac5b219af3)

-----------------------------------------------------------------------

Summary of changes:
 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 d8e6abc..7a1c85d 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 ) || 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 d84ffb4..c9c7aaf 100644
--- 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>