summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2015-11-22 10:31:35 +0100
committerKurt Roeckx <kurt@roeckx.be>2015-11-22 12:25:00 +0100
commit88883f2ebff3927b52d609928f632cfe670b7ba9 (patch)
tree7f5c07744633ad69df7e42ff2fded5adcebb03cc
parent638856f40c67b1fa68d60ab2da3b1d83a5a97bc1 (diff)
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 (cherry picked from commit 3d32218812e87221344f2985512e42e4aaa88745)
-rw-r--r--crypto/opensslconf.h.in2
-rw-r--r--e_os.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index 814309becb..d8e6abcf16 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 758448596a..d84ffb446b 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)
# 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(__svr4__) && !defined(__SVR4)
/* include headers first, so our defines don't break it */
# include <stdlib.h>
# include <string.h>