summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-22 14:37:50 +0000
committerRichard Levitte <levitte@openssl.org>2001-02-22 14:37:50 +0000
commita5bc1e856861b99b99ae215d809ff4d9826ded68 (patch)
tree069afc5bfd49639e4cfccc13d695104d211b8430
parentc38171ba1fc748e0e8b95d35048ae9b3b733a2aa (diff)
downloadopenssl-new-a5bc1e856861b99b99ae215d809ff4d9826ded68.tar.gz
Use e_os2.h rather than opensslconf.h, since some needed macros are
defined there.
-rw-r--r--crypto/bio/bss_log.c2
-rw-r--r--crypto/bn/bn.h2
-rw-r--r--crypto/des/des_locl.h4
-rw-r--r--crypto/des/destest.c7
-rw-r--r--crypto/des/read_pwd.c2
5 files changed, 9 insertions, 8 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b289c97d3c..13fb517c18 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -66,7 +66,7 @@
#include <stdio.h>
#include <errno.h>
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
#if defined(OPENSSL_SYS_WIN32)
# include <process.h>
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 218907b8cd..22e8c2d910 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -59,10 +59,10 @@
#ifndef HEADER_BN_H
#define HEADER_BN_H
+#include <openssl/e_os2.h>
#ifndef OPENSSL_NO_FP_API
#include <stdio.h> /* FILE */
#endif
-#include <openssl/opensslconf.h>
#ifdef __cplusplus
extern "C" {
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 5a9ba36fb3..8c49894e1c 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -59,6 +59,8 @@
#ifndef HEADER_DES_LOCL_H
#define HEADER_DES_LOCL_H
+#include <openssl/e_os2.h>
+
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
#ifndef OPENSSL_SYS_MSDOS
#define OPENSSL_SYS_MSDOS
@@ -68,8 +70,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <openssl/opensslconf.h>
-
#ifndef OPENSSL_SYS_MSDOS
#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
#ifdef OPENSSL_UNISTD
diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 6f60e080ff..1be401fb21 100644
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -56,15 +56,16 @@
* [including the GNU Public Licence.]
*/
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <openssl/e_os2.h>
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
#ifndef OPENSSL_SYS_MSDOS
#define OPENSSL_SYS_MSDOS
#endif
#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/opensslconf.h>
#ifndef OPENSSL_SYS_MSDOS
#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)
#include OPENSSL_UNISTD
diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index 542df5bb66..db021dfc37 100644
--- a/crypto/des/read_pwd.c
+++ b/crypto/des/read_pwd.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WIN32)
#ifdef OPENSSL_UNISTD
# include OPENSSL_UNISTD