Commit 2f2c805a authored by Andy Polyakov's avatar Andy Polyakov
Browse files

e_os.h: __sun done right. 



RT #4144

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 46ddbcf2

crypto/opensslconf.h.in

+1 −1
Original line number Diff line number Diff line
@@ -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

e_os.h

+4 −24
Original line number Diff line number Diff line
@@ -553,9 +553,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); 
#    include <sys/select.h>

#   endif



#   if defined(__sun)

#    include <sys/filio.h>

#   else

#   ifndef VMS

#    include <sys/ioctl.h>

#   else
@@ -564,7 +561,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); 
#     include <sys/ioctl.h>

#    endif

#   endif

#   endif



#   ifdef VMS

#    include <unixio.h>
@@ -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)