Include opensslconf.h or the like early to make sure system macros get

correctly defined.

3 files changed, 10 insertions, 8 deletions

diff --git a/apps/s_client.c b/apps/s_client.c
index 19c9a217df..1a9565e1ac 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -60,6 +60,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/opensslconf.h>
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
diff --git a/apps/s_server.c b/apps/s_server.c
index 2fa35f4d10..ad09962313 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -62,6 +62,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <openssl/opensslconf.h>
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
diff --git a/apps/s_socket.c b/apps/s_socket.c
index c261abb361..f60d929484 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,6 +62,14 @@
 #include <errno.h>
 #include <signal.h>
 
+#define USE_SOCKETS
+#define NON_MAIN
+#include "apps.h"
+#undef USE_SOCKETS
+#undef NON_MAIN
+#include "s_apps.h"
+#include <openssl/ssl.h>
+
 /* With IPv6, it looks like Digital has mixed up the proper order of
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
@@ -71,14 +79,6 @@
 typedef unsigned int u_int;
 #endif
 
-#define USE_SOCKETS
-#define NON_MAIN
-#include "apps.h"
-#undef USE_SOCKETS
-#undef NON_MAIN
-#include "s_apps.h"
-#include <openssl/ssl.h>
-
 static struct hostent *GetHostByName(char *name);
 #ifdef OPENSSL_SYS_WINDOWS
 static void sock_cleanup(void);