Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 678e4d547025113992e54dfea13797bb441ab718..b8d053bda573aa083d2926948c50dc87ce1aa774 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -103,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
@@ -351,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