Support additional Win32 compilers.

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 510db0e9ac5dae434cf306014e66726267970dcb..cff94e3e2df0bc9d8b414d0afa24b2cadd1b61ee 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -75,10 +75,6 @@ extern "C" {
 #define DEVRANDOM "/dev/urandom"
 #endif
 
-#if defined(NOCONST)
-#define const
-#endif
-
 /********************************************************************
  The Microsoft section
  ********************************************************************/
@@ -102,6 +98,9 @@ extern "C" {
 #ifdef WIN32
 #define get_last_sys_error()   GetLastError()
 #define clear_sys_error()      SetLastError(0)
+#if !defined(WINNT)
+#define WIN_CONSOLE_BUG
+#endif
 #else
 #define get_last_sys_error()   errno
 #define clear_sys_error()      errno=0
@@ -143,9 +142,13 @@ extern "C" {
 
 #ifndef S_IFMT
 #define S_IFMT _S_IFMT
+
+#if !defined(WINNT)
+#define NO_SYSLOG
 #endif
+#define NO_DIRENT
 
-#define strncasecmp(a,b,c)     strnicmp((a),(b),(c))
+#endif
 
 #  ifdef WINDOWS
 #    include <windows.h>
@@ -157,6 +160,13 @@ 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
+#endif
+
 #if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
 #  define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); }
 #else
@@ -172,7 +182,8 @@ extern "C" {
 #ifndef R_OK
 #  define R_OK 4
 #endif
-#  define SSLEAY_CONF  "ssleay.cnf"
+#  define OPENSSL_CONF "openssl.cnf"
+#  define SSLEAY_CONF  OPENSSL_CONF
 #  define NUL_DEV      "nul"
 #  define RFILE                ".rnd"
 
@@ -184,7 +195,8 @@ extern "C" {
 #    include <unistd.h>
 #  endif
 
-#  define SSLEAY_CONF  "ssleay.cnf"
+#  define OPENSSL_CONF "openssl.cnf"
+#  define SSLEAY_CONF  OPENSSL_CONF
 #  define RFILE                ".rnd"
 #  define LIST_SEPARATOR_CHAR ':'
 #  ifndef MONOLITH
@@ -269,26 +281,6 @@ extern HINSTANCE _hInstance;
 
 /***********************************************/
 
-#ifndef NOPROTO
-#define P_CC_CC        const void *,const void *
-#define P_I_I          int,int 
-#define P_I_I_P                int,int,char *
-#define P_I_I_P_I      int,int,char *,int
-#define P_IP_I_I_P_I   int *,int,int,char *,int
-#define P_V            void 
-#else
-#define P_CC_CC
-#define P_I_I
-#define P_I_I_P
-#define P_IP_I_I_P_I
-#define P_I_I_P_I
-#define P_V
-#endif
-
-/* not used yet */
-#define        CS_BEGIN
-#define CS_END
-
 /* do we need to do this for getenv.
  * Just define getenv for use under windows */