From 1d684f2ee67a4c3ad413e8d27aa63da4baa5862f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 26 May 2014 13:55:24 +0000
Subject: There is no need to include <openssl/e_os2.h> here, except for the
 fact that it brings in <openssl/opensslconf.h>, so just do that instead
 (currently via apps.h).

---
 src/lib/libssl/src/apps/apps.h     | 3 ++-
 src/lib/libssl/src/apps/ocsp.c     | 1 -
 src/lib/libssl/src/apps/s_client.c | 1 -
 src/lib/libssl/src/apps/s_server.c | 1 -
 src/lib/libssl/src/apps/s_socket.c | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h
index 7a5caa1bc3..4a04c5aee5 100644
--- a/src/lib/libssl/src/apps/apps.h
+++ b/src/lib/libssl/src/apps/apps.h
@@ -112,9 +112,10 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
+#include <openssl/opensslconf.h>
+
 #include <openssl/bio.h>
 #include <openssl/conf.h>
-#include <openssl/e_os2.h>
 #include <openssl/lhash.h>
 #include <openssl/ossl_typ.h>
 #include <openssl/txt_db.h>
diff --git a/src/lib/libssl/src/apps/ocsp.c b/src/lib/libssl/src/apps/ocsp.c
index 5e9e101bc5..b1d5c94690 100644
--- a/src/lib/libssl/src/apps/ocsp.c
+++ b/src/lib/libssl/src/apps/ocsp.c
@@ -67,7 +67,6 @@
 
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
-#include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/ssl.h>
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index 66feb0d66b..0720dc9f2b 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -153,7 +153,6 @@
 #include "apps.h"
 
 #include <openssl/bn.h>
-#include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
 #include <openssl/pem.h>
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index b45816b17a..be77264fb0 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -160,7 +160,6 @@
 #include "apps.h"
 
 #include <openssl/bn.h>
-#include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/lhash.h>
 #include <openssl/ocsp.h>
diff --git a/src/lib/libssl/src/apps/s_socket.c b/src/lib/libssl/src/apps/s_socket.c
index d825fd73a5..409449b6b0 100644
--- a/src/lib/libssl/src/apps/s_socket.c
+++ b/src/lib/libssl/src/apps/s_socket.c
@@ -69,7 +69,6 @@
 
 #include "apps.h"
 
-#include <openssl/e_os2.h>
 #include <openssl/ssl.h>
 
 #include "s_apps.h"
-- 
cgit v1.2.3-55-g6feb