Always include opensslconf.h, even if it's already been done before.

The reason is that some parts are only included when certain other
include files have been included.

Also, it seems that the rest of the OpenSSL code assumes that all
kinds of M$ Windows are MSDOS as well...

diff --git a/e_os2.h b/e_os2.h
index 4785720a5c4c26d413840d7d5aceaa8cca49018d..be20eac623e1e15a9ae3064816ad3739bfcbf718 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -53,11 +53,11 @@
  *
  */
 
+#include <openssl/opensslconf.h>
+
 #ifndef HEADER_E_OS2_H
 #define HEADER_E_OS2_H
 
-#include <openssl/opensslconf.h> /* OPENSSL_UNISTD */
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -108,6 +108,9 @@ extern "C" {
 #if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINNT)
 # undef OPENSSL_SYS_UNIX
 # define OPENSSL_SYS_WINDOWS
+# ifndef OPENSSL_SYS_MSDOS
+#  define OPENSSL_SYS_MSDOS
+# endif
 #endif
 
 /* -------------------------------- OpenVMS -------------------------------- */