summaryrefslogtreecommitdiffstats
path: root/apps/s_socket.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-08-21 17:22:19 -0400
committerRich Salz <rsalz@openssl.org>2017-08-22 14:15:40 -0400
commit0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01 (patch)
tree640bd7aea51a53d5e98666aa8ef2cb78270bdff6 /apps/s_socket.c
parent94e1f8ab5a9e5996d1808f236c77343acfad9d33 (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_socket.c')
-rw-r--r--apps/s_socket.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 804ab5b05a..3bdb587395 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -28,10 +28,9 @@ typedef unsigned int u_int;
#ifndef OPENSSL_NO_SOCK
-# define USE_SOCKETS
# include "apps.h"
-# undef USE_SOCKETS
# include "s_apps.h"
+# include "internal/sockets.h"
# include <openssl/bio.h>
# include <openssl/err.h>