bss_log has dollars, so compile it with that warning flag disabled.

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 12f39788ebf70fa116184db6ec84c55231bce4e7..7f5f62d113372fa0b17d22fc4ed56cdd18882ec0 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -84,8 +84,11 @@ 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
@@ -104,6 +107,10 @@ extern "C" {
 #  define MS_STATIC
 #endif
 
+#if defined(_WIN32) && !defined(WIN32)
+#  define WIN32
+#endif
+
 #if defined(WIN32) || defined(WIN16)
 #  ifndef WINDOWS
 #    define WINDOWS
@@ -164,19 +171,18 @@ extern "C" {
 
 #if defined(WINDOWS) || defined(MSDOS)
 
-#ifndef S_IFDIR
-#define S_IFDIR        _S_IFDIR
-#endif
-
-#ifndef S_IFMT
-#define S_IFMT _S_IFMT
+#  ifndef S_IFDIR
+#    define S_IFDIR    _S_IFDIR
+#  endif
 
-#if !defined(WINNT)
-#define NO_SYSLOG
-#endif
-#define NO_DIRENT
+#  ifndef S_IFMT
+#    define S_IFMT     _S_IFMT
+#  endif
 
-#endif
+#  if !defined(WINNT)
+#    define NO_SYSLOG
+#  endif
+#  define NO_DIRENT
 
 #  ifdef WINDOWS
 #    include <windows.h>
@@ -188,29 +194,33 @@ extern "C" {
 #  include <io.h>
 #  include <fcntl.h>
 
-#if defined (__BORLANDC__)
-#define _setmode setmode
-#define _O_TEXT O_TEXT
-#define _O_BINARY O_BINARY
-#define _int64 __int64
-#define _kbhit kbhit
-#endif
+#  ifdef __MINGW32__
+#    define ssize_t long
+#  endif
 
-#if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
-#  define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); }
-#else
-#  define EXIT(n)              return(n);
-#endif
+#  if defined (__BORLANDC__)
+#    define _setmode setmode
+#    define _O_TEXT O_TEXT
+#    define _O_BINARY O_BINARY
+#    define _int64 __int64
+#    define _kbhit kbhit
+#  endif
+
+#  if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
+#    define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); }
+#  else
+#    define EXIT(n)            return(n);
+#  endif
 #  define LIST_SEPARATOR_CHAR ';'
-#ifndef X_OK
-#  define X_OK 0
-#endif
-#ifndef W_OK
-#  define W_OK 2
-#endif
-#ifndef R_OK
-#  define R_OK 4
-#endif
+#  ifndef X_OK
+#    define X_OK       0
+#  endif
+#  ifndef W_OK
+#    define W_OK       2
+#  endif
+#  ifndef R_OK
+#    define R_OK       4
+#  endif
 #  define OPENSSL_CONF "openssl.cnf"
 #  define SSLEAY_CONF  OPENSSL_CONF
 #  define NUL_DEV      "nul"
@@ -249,16 +259,23 @@ extern "C" {
                                      __VMS_EXIT |= 0x10000000; \
                                     return(n); } while(0)
 #    endif
+#    define NO_SYS_PARAM_H
 #  else
      /* !defined VMS */
 #    ifdef OPENSSL_UNISTD
-#      include OPENSLL_UNISTD
+#      include OPENSSL_UNISTD
 #    else
 #      include <unistd.h>
 #    endif
 #    ifndef NO_SYS_TYPES_H
 #      include <sys/types.h>
 #    endif
+#    ifdef NeXT
+#      define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP
+                         * (unless when compiling with -D_POSIX_SOURCE,
+                         * which doesn't work for us) */
+#      define ssize_t int /* ditto */
+#    endif
 
 #    define OPENSSL_CONF       "openssl.cnf"
 #    define SSLEAY_CONF                OPENSSL_CONF
@@ -307,7 +324,7 @@ extern HINSTANCE _hInstance;
 
 #  else
 
-#    ifndef VMS
+#    ifndef NO_SYS_PARAM_H
 #      include <sys/param.h>
 #    endif
 #    include <sys/time.h> /* Needed under linux for FD_XXX */