[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Kurt Roeckx]

The branch OpenSSL_1_0_2-stable has been updated
       via  fb92839c93c7efc3687fe895e631be57dec3e37f (commit)
      from  6d31885d4ac4965745a6ddff64826ae11d73d58e (commit)


- Log -----------------------------------------------------------------
commit fb92839c93c7efc3687fe895e631be57dec3e37f
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sun Nov 22 10:31:35 2015 +0100

    Use defined(__sun) instead of defined(sun)
    
    Strict ISO confirming C compilers only define __sun
    
    Reviewed-by: Viktor Dukhovni <openssl-users at dukhovni.org>
    
    RT #4144, MR #1353
    
    (cherry picked from commit 3d32218812e87221344f2985512e42e4aaa88745)

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

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 814309b..d8e6abc 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 45fef69..8ac3673 100644
--- a/e_os.h
+++ b/e_os.h
@@ -619,7 +619,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
@@ -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 <stdlib.h>
 #  include <string.h>