diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-08-21 17:22:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-08-22 14:15:40 -0400 |
| commit | 0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01 (patch) | |
| tree | 640bd7aea51a53d5e98666aa8ef2cb78270bdff6 /apps/s_client.c | |
| parent | 94e1f8ab5a9e5996d1808f236c77343acfad9d33 (diff) | |
(Re)move some things from e_os.h
Remove GETPID_IS_MEANINGLESS and osslargused.
Move socket-related things to new file internal/sockets.h; this is now
only needed by four(!!!) files. Compiles should be a bit faster.
Remove USE_SOCKETS ifdef's
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4209)
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 5ae52b453f..5f7b31c9dc 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -13,6 +13,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include "e_os.h" #include <openssl/e_os2.h> #ifndef OPENSSL_NO_SOCK @@ -28,7 +29,6 @@ typedef unsigned int u_int; #endif -#define USE_SOCKETS #include "apps.h" #include <openssl/x509.h> #include <openssl/ssl.h> @@ -46,6 +46,7 @@ typedef unsigned int u_int; #endif #include "s_apps.h" #include "timeouts.h" +#include "internal/sockets.h" #if defined(__has_feature) # if __has_feature(memory_sanitizer) |