X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=fa2a117762b7ef1519cdfeddbb752cd0513861e9;hp=96ce4cf91961cce51432febfad79feb9961a1e75;hb=891e465607f2c98d041bba6b0c269a630c5cf414;hpb=b6b1f0d0aaaecfdc2ebfd613df6122b0bc922165

diff --git a/e_os.h b/e_os.h
index 96ce4cf919..fa2a117762 100644
--- a/e_os.h
+++ b/e_os.h
@@ -84,10 +84,15 @@ extern "C" {
 
 #if defined(__MWERKS__) && defined(macintosh)
 # if macintosh==1
-#  define MAC_OS_pre_X
-#  define NO_SYS_TYPES_H
+#  ifndef MAC_OS_GUSI_SOURCE
+#    define MAC_OS_pre_X
+#    define NO_SYS_TYPES_H
+#  endif
+#  define NO_SYS_PARAM_H
 #  define NO_CHMOD
 #  define NO_SYSLOG
+#  undef  DEVRANDOM
+#  define GETPID_IS_MEANINGLESS
 # endif
 #endif
 
@@ -111,6 +116,10 @@ extern "C" {
 #  endif
 #endif
 
+#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)
+#  define GETPID_IS_MEANINGLESS
+#endif
+
 #ifdef WIN32
 #define get_last_sys_error()	GetLastError()
 #define clear_sys_error()	SetLastError(0)
@@ -128,7 +137,7 @@ extern "C" {
 #define readsocket(s,b,n)	recv((s),(b),(n),0)
 #define writesocket(s,b,n)	send((s),(b),(n),0)
 #define EADDRINUSE		WSAEADDRINUSE
-#elif MAC_OS_pre_X
+#elif defined(MAC_OS_pre_X)
 #define get_last_socket_error()	errno
 #define clear_socket_error()	errno=0
 #define closesocket(s)		MacSocket_close(s)
@@ -243,9 +252,17 @@ extern "C" {
                                      __VMS_EXIT |= 0x10000000; \
 				     return(n); } while(0)
 #    endif
+#    define NO_SYS_PARAM_H
 #  else
      /* !defined VMS */
-#    include OPENSSL_UNISTD
+#    ifdef OPENSSL_UNISTD
+#      include OPENSSL_UNISTD
+#    else
+#      include <unistd.h>
+#    endif
+#    ifndef NO_SYS_TYPES_H
+#      include <sys/types.h>
+#    endif
 
 #    define OPENSSL_CONF	"openssl.cnf"
 #    define SSLEAY_CONF		OPENSSL_CONF
@@ -294,8 +311,7 @@ extern HINSTANCE _hInstance;
 
 #  else
 
-#    include <sys/types.h>
-#    ifndef VMS
+#    ifndef NO_SYS_PARAM_H
 #      include <sys/param.h>
 #    endif
 #    include <sys/time.h> /* Needed under linux for FD_XXX */