X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=58934d1be104f5d49264ae1c0002c2448032483c;hp=bbb1c304d6556c2e0d8a66dccb2b10484607dfe0;hb=4f6235f701587189bc159715902933e1ecedd15e;hpb=95f9968e5ea5b010415a803db0074c4e4528b4a8

diff --git a/e_os.h b/e_os.h
index bbb1c304d6..58934d1be1 100644
--- a/e_os.h
+++ b/e_os.h
@@ -59,6 +59,8 @@
 #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
@@ -103,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
@@ -229,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