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

correctly defined.
This commit is contained in:
Richard Levitte 2001-02-20 13:11:54 +00:00
parent 6525ced540
commit 56dde3ebe6
3 changed files with 10 additions and 8 deletions

View File

@ -60,6 +60,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <openssl/opensslconf.h>
#ifdef OPENSSL_NO_STDIO #ifdef OPENSSL_NO_STDIO
#define APPS_WIN16 #define APPS_WIN16
#endif #endif

View File

@ -62,6 +62,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <openssl/opensslconf.h>
#ifdef OPENSSL_NO_STDIO #ifdef OPENSSL_NO_STDIO
#define APPS_WIN16 #define APPS_WIN16
#endif #endif

View File

@ -62,6 +62,14 @@
#include <errno.h> #include <errno.h>
#include <signal.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 /* With IPv6, it looks like Digital has mixed up the proper order of
recursive header file inclusion, resulting in the compiler complaining recursive header file inclusion, resulting in the compiler complaining
that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
@ -71,14 +79,6 @@
typedef unsigned int u_int; typedef unsigned int u_int;
#endif #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); static struct hostent *GetHostByName(char *name);
#ifdef OPENSSL_SYS_WINDOWS #ifdef OPENSSL_SYS_WINDOWS
static void sock_cleanup(void); static void sock_cleanup(void);