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

correctly defined.

diff --git a/apps/s_client.c b/apps/s_client.c
index 19c9a217dfd835db883b1ebd0ad8ff621443159d..1a9565e1ac322b39ee45c7ddb1f441bc2c4645a6 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -60,6 +60,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <openssl/opensslconf.h>

 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif

diff --git a/apps/s_server.c b/apps/s_server.c
index 2fa35f4d101fb60e6600f4daf7f9a389c17050b4..ad09962313ca4e1198672e13e2d696c194cb988d 100644 (file)
--- 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 <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <openssl/opensslconf.h>

 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif

diff --git a/apps/s_socket.c b/apps/s_socket.c
index c261abb3612430c6ae5f34d895fe90d633548812..f60d92948431bb96d983ad66b31abcef1fe14e3c 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,6 +62,14 @@
 #include <errno.h>
 #include <signal.h>
 
 #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
 /* 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
 
 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);
 static struct hostent *GetHostByName(char *name);
 #ifdef OPENSSL_SYS_WINDOWS
 static void sock_cleanup(void);