Oops!

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 01a9c9402a7d91d5667fba0d6c937e733a403e6e..b8d053bda573aa083d2926948c50dc87ce1aa774 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -59,6 +59,11 @@
 #ifndef HEADER_E_OS_H
 #define HEADER_E_OS_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 +103,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
@@ -242,17 +244,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 +348,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