[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  2f2c805a2649fcbe8919242b78982c8e9344e2f3 (commit)
      from  46ddbcf2b4d6b7fd014cc40db578a5c3ed657149 (commit)


- Log -----------------------------------------------------------------
commit 2f2c805a2649fcbe8919242b78982c8e9344e2f3
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Nov 22 13:39:35 2015 +0100

    e_os.h: __sun done right.
    
    RT #4144
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 crypto/opensslconf.h.in |  2 +-
 e_os.h                  | 28 ++++------------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index 70db66d..f121179 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(sparc) || defined(__sparc__)	/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/e_os.h b/e_os.h
index fcf3af9..30ddbc9 100644
--- a/e_os.h
+++ b/e_os.h
@@ -553,16 +553,12 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #    include <sys/select.h>
 #   endif
 
-#   if defined(__sun)
-#    include <sys/filio.h>
+#   ifndef VMS
+#    include <sys/ioctl.h>
 #   else
-#    ifndef VMS
+        /* ioctl is only in VMS > 7.0 and when socketshr is not used */
+#    if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
 #     include <sys/ioctl.h>
-#    else
-         /* ioctl is only in VMS > 7.0 and when socketshr is not used */
-#     if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
-#      include <sys/ioctl.h>
-#     endif
 #    endif
 #   endif
 
@@ -595,22 +591,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 
 # endif
 
-# if defined(__sun) && !defined(__svr4__) && !defined(__SVR4)
-  /* include headers first, so our defines don't break it */
-#  include <stdlib.h>
-#  include <string.h>
-  /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
-#  define memmove(s1,s2,n) bcopy((s2),(s1),(n))
-#  define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
-extern char *sys_errlist[];
-extern int sys_nerr;
-#  define strerror(errnum) \
-        (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
-  /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
-#  include "internal/o_str.h"
-#  define memcmp OPENSSL_memcmp
-# endif
-
 # ifndef OPENSSL_EXIT
 #  if defined(MONOLITH) && !defined(OPENSSL_C)
 #   define OPENSSL_EXIT(n) return(n)