The Mingw32 configuration entry was missing one colon (found by

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 01a9c9402a7d91d5667fba0d6c937e733a403e6e..58934d1be104f5d49264ae1c0002c2448032483c 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -59,6 +59,13 @@
 #ifndef HEADER_E_OS_H
 #define HEADER_E_OS_H
 
+#include <openssl/opensslconf.h>
+
+#include <openssl/e_os2.h>
+/* <openssl/e_os2.h> contains what we can justify to make visible
+ * to the outside; this file e_os.h is not part of the exported
+ * interface. */
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -98,9 +105,6 @@ extern "C" {
 #ifdef WIN32
 #define get_last_sys_error()   GetLastError()
 #define clear_sys_error()      SetLastError(0)
-/* These are defined in wincrypt.h and can cause problems */
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
 #if !defined(WINNT)
 #define WIN_CONSOLE_BUG
 #endif
@@ -224,7 +228,8 @@ extern "C" {
                                     return(n); } while(0)
 #    endif
 #  else
-#    include <unistd.h>
+     /* !defined VMS */
+#    include OPENSSL_UNISTD
 
 #    define OPENSSL_CONF       "openssl.cnf"
 #    define SSLEAY_CONF                OPENSSL_CONF
@@ -242,17 +247,6 @@ extern "C" {
 
 #endif
 
-/* Definitions of GLOBAL and EXTERN, to define and declare certain global
-   symbols that, with some compilers under VMS, have to be defined and
-   declared explicitely with globaldef and globalref.  On other OS:es,
-   these macros are defined with something sensible. */
-#if defined(VMS) && !defined(__DECC)
-#define EXTERN globalref
-#define GLOBAL globaldef
-#else
-#define EXTERN extern
-#define GLOBAL
-#endif
 
 /*************/
 
@@ -357,6 +351,9 @@ extern HINSTANCE _hInstance;
 #ifdef sgi
 #define IRIX_CC_BUG    /* all version of IRIX I've tested (4.* 5.*) */
 #endif
+#ifdef SNI
+#define IRIX_CC_BUG    /* CDS++ up to V2.0Bsomething suffered from the same bug.*/
+#endif
 
 #ifdef NO_MD2
 #define MD2_Init MD2Init