[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  3d32218812e87221344f2985512e42e4aaa88745 (commit)
      from  652d4a8c83f1dd33b2e617e8cc7d0cfea3d0aedf (commit)


- Log -----------------------------------------------------------------
commit 3d32218812e87221344f2985512e42e4aaa88745
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

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

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 c37dbba..70db66d 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 4298ec1..fcf3af9 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>