summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-22 13:59:36 +0000
committerRichard Levitte <levitte@openssl.org>2001-02-22 13:59:36 +0000
commit1961b327eb0e019cedd48c6b2f907ff6c2e3ad17 (patch)
tree18d780d7ef42cbd05a20e8143d3b8d8e25aa3d23
parent2ae87d465e03d258848b2e8856c9498d8bc46a01 (diff)
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...
-rw-r--r--e_os2.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/e_os2.h b/e_os2.h
index 4785720a5c..be20eac623 100644
--- 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 -------------------------------- */