apps: directly inclusion of "e_os.h when needed

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14344)

diff --git a/apps/ca.c b/apps/ca.c
index a8966399b11cf6eb0079d9aa0bc205a82093666b..6d1d1c0a6ea039385dc0d37fcd77f1a0c0402163 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -6,6 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/apps/cmp.c b/apps/cmp.c
index dc2a1c3a6aee09fe06b318d2e77240c352edcde0..3fa7dd936187ed48dd136f433661b9908df227e5 100644 (file)
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -10,6 +10,7 @@
  */
 
 /* This app is disabled when OPENSSL_NO_CMP is defined. */
+#include "internal/e_os.h"
 
 #include <string.h>
 #include <ctype.h>

diff --git a/apps/include/apps.h b/apps/include/apps.h
index 7c5510976dab9a88d1d18a9814b55721fe832234..62b5cf9a0132ad8c0c0e8488625f734ebda1e453 100644 (file)
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -10,10 +10,8 @@
 #ifndef OSSL_APPS_H
 # define OSSL_APPS_H
 
-# include "internal/e_os.h" /* struct timeval for DTLS */
 # include "internal/common.h" /* for HAS_PREFIX */
 # include "internal/nelem.h"
-# include "internal/sockets.h" /* for openssl_fdset() */
 # include <assert.h>
 
 # include <stdarg.h>

diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index 9ca605656382320c677817f4242d3f112648d47f..64d0f9b30910114bf1cc913f3a0530077eb8d28d 100644 (file)
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h" /* LIST_SEPARATOR_CHAR */
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 490ad99adef8d35e51974040ced1e083f52a1e59..38f031197478a2047c1b25f819f25ca01acdde68 100644 (file)
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -48,6 +48,9 @@
 #include "s_apps.h"
 #include "apps.h"
 
+#include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/e_os.h"
+
 #ifdef _WIN32
 static int WIN32_rename(const char *from, const char *to);
 # define rename(from, to) WIN32_rename((from), (to))

diff --git a/apps/lib/engine_loader.c b/apps/lib/engine_loader.c
index b3ed120ea0a099c19dd6906fb65f48de25ec5c0a..e0f26f614afe21d2a428a92cf86711105e156688 100644 (file)
--- a/apps/lib/engine_loader.c
+++ b/apps/lib/engine_loader.c
@@ -14,6 +14,7 @@
  */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
+#include "internal/e_os.h"
 #include "apps.h"
 
 #ifndef OPENSSL_NO_ENGINE

diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 4bc2012a1edbe3431748a6f12af48539502f2374..e80ad14eb66c0958fb2ac5cc61883d5862437577 100644 (file)
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -18,8 +18,10 @@
 #endif
 
 #include <ctype.h>
+#include "internal/e_os.h"
 #include "http_server.h"
-#include "internal/sockets.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
+
 #include <openssl/err.h>
 #include <openssl/trace.h>
 #include <openssl/rand.h>

diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index f7454053cfea4c4fd7bd1dcc5f3165f0fb40df66..658192421d9b4d69eb0588f19fe69a36f33b43bc 100644 (file)
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -37,9 +37,10 @@ typedef unsigned int u_int;
 
 #ifndef OPENSSL_NO_SOCK
 
+# include "internal/e_os.h"
 # include "apps.h"
 # include "s_apps.h"
-# include "internal/sockets.h"
+# include "internal/sockets.h" /* for openssl_fdset() */
 
 # include <openssl/bio.h>
 # include <openssl/err.h>

diff --git a/apps/list.c b/apps/list.c
index 14a20bd74a63ecf83308a855f6010fe0ff5c7025..c0b0a5a4c4322202f08496f2bd9b5ff3a5bcecdc 100644 (file)
--- a/apps/list.c
+++ b/apps/list.c
@@ -10,6 +10,8 @@
 /* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
+#include "internal/e_os.h"
+
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>

diff --git a/apps/openssl.c b/apps/openssl.c
index adf77096c7f31cda452ac11c05a5d0f6d47b5016..cbd3476b32b668777a70ee8ba46030ccc6ec3dd0 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -7,6 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "internal/common.h"

diff --git a/apps/rehash.c b/apps/rehash.c
index 9a5be029d3fb9fbbe1d0f6c859aa933e3181183e..6226f0f545aa5144f54220ed125ad7bcbe6cb369 100644 (file)
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -8,6 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h" /* LIST_SEPARATOR_CHAR */
 #include "apps.h"
 #include "progs.h"
 

diff --git a/apps/s_client.c b/apps/s_client.c
index 5eec42f3cc424291b2b2dfd67befdf3517a4fbf5..c922653ee773e767356bdac658566553654a0437 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <openssl/e_os2.h>
 #include "internal/nelem.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
 
 #ifndef OPENSSL_NO_SOCK
 

diff --git a/apps/s_server.c b/apps/s_server.c
index 4a26c0178f1b828b02e0a25bf2cdc6725bb10744..e47691655e9e7b92d9566f5c3ed30117dab6da95 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -9,6 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,6 +24,7 @@
 #include <openssl/async.h>
 #include <openssl/ssl.h>
 #include <openssl/decoder.h>
+#include "internal/sockets.h" /* for openssl_fdset() */
 
 #ifndef OPENSSL_NO_SOCK
 

diff --git a/apps/speed.c b/apps/speed.c
index afebda62e036a1faa29f4785dfc8702e3cfa15cf..db0327187d560d49a7d15b5ab7214104b012ec5d 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -26,6 +26,7 @@
 
 /* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
+#include "internal/e_os.h"
 
 #include <stdio.h>
 #include <stdlib.h>