6 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 1ae9d96577..0972feeb58 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -59,16 +59,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
-#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
-#include <netdb.h>
-#if defined(NETWARE_CLIB)
 #include <sys/ioctl.h>
-NETDB_DEFINE_CONTEXT
-#endif
+#include <netdb.h>
-#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
 #ifndef OPENSSL_NO_SOCK
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index a272ada366..27a4d371dc 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -58,9 +58,9 @@
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
+#include <sys/socket.h>
 #ifndef OPENSSL_NO_SOCK
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 9c5320cafb..46667bc7d6 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -58,9 +58,11 @@
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #ifndef OPENSSL_NO_SOCK
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index 4c54601abc..50281b5650 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -60,10 +60,12 @@
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #ifndef OPENSSL_NO_DGRAM
 #ifndef OPENSSL_NO_SCTP
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index 4369d6411d..b84719c487 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -58,7 +58,6 @@
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #if defined(OPENSSL_NO_POSIX_IO)
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 5335495c6e..7c499634fb 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -58,8 +58,8 @@
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
+#include <sys/socket.h>
 #ifndef OPENSSL_NO_SOCK

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 1ae9d96577..0972feeb58 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c
@@ -59,16 +59,13 @@
59	#include <stdio.h>	59	#include <stdio.h>
60	#include <stdlib.h>	60	#include <stdlib.h>
61	#include <errno.h>	61	#include <errno.h>
62	#define USE_SOCKETS
63	#include "cryptlib.h"	62	#include "cryptlib.h"
64	#include <openssl/bio.h>	63	#include <openssl/bio.h>
65	#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
66	#include <netdb.h>
67	#if defined(NETWARE_CLIB)
68	#include <sys/ioctl.h>	64	#include <sys/ioctl.h>
69	NETDB_DEFINE_CONTEXT	65
70	#endif	66	#include <netdb.h>
71	#endif	67	#include <sys/socket.h>
		68	#include <netinet/in.h>
72		69
73	#ifndef OPENSSL_NO_SOCK	70	#ifndef OPENSSL_NO_SOCK
74		71


diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index a272ada366..27a4d371dc 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -58,9 +58,9 @@
58		58
59	#include <stdio.h>	59	#include <stdio.h>
60	#include <errno.h>	60	#include <errno.h>
61	#define USE_SOCKETS
62	#include "cryptlib.h"	61	#include "cryptlib.h"
63	#include <openssl/bio.h>	62	#include <openssl/bio.h>
		63	#include <sys/socket.h>
64		64
65	#ifndef OPENSSL_NO_SOCK	65	#ifndef OPENSSL_NO_SOCK
66		66


diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 9c5320cafb..46667bc7d6 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -58,9 +58,11 @@
58		58
59	#include <stdio.h>	59	#include <stdio.h>
60	#include <errno.h>	60	#include <errno.h>
61	#define USE_SOCKETS
62	#include "cryptlib.h"	61	#include "cryptlib.h"
63	#include <openssl/bio.h>	62	#include <openssl/bio.h>
		63	#include <netdb.h>
		64	#include <sys/socket.h>
		65	#include <netinet/in.h>
64		66
65	#ifndef OPENSSL_NO_SOCK	67	#ifndef OPENSSL_NO_SOCK
66		68


diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index 4c54601abc..50281b5650 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -60,10 +60,12 @@
60		60
61	#include <stdio.h>	61	#include <stdio.h>
62	#include <errno.h>	62	#include <errno.h>
63	#define USE_SOCKETS
64	#include "cryptlib.h"	63	#include "cryptlib.h"
65
66	#include <openssl/bio.h>	64	#include <openssl/bio.h>
		65	#include <netdb.h>
		66	#include <sys/socket.h>
		67	#include <netinet/in.h>
		68
67	#ifndef OPENSSL_NO_DGRAM	69	#ifndef OPENSSL_NO_DGRAM
68		70
69	#ifndef OPENSSL_NO_SCTP	71	#ifndef OPENSSL_NO_SCTP


diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c index 4369d6411d..b84719c487 100644 --- a/src/lib/libcrypto/bio/bss_fd.c +++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -58,7 +58,6 @@
58		58
59	#include <stdio.h>	59	#include <stdio.h>
60	#include <errno.h>	60	#include <errno.h>
61	#define USE_SOCKETS
62	#include "cryptlib.h"	61	#include "cryptlib.h"
63		62
64	#if defined(OPENSSL_NO_POSIX_IO)	63	#if defined(OPENSSL_NO_POSIX_IO)


diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c index 5335495c6e..7c499634fb 100644 --- a/src/lib/libcrypto/bio/bss_sock.c +++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -58,8 +58,8 @@
58		58
59	#include <stdio.h>	59	#include <stdio.h>
60	#include <errno.h>	60	#include <errno.h>
61	#define USE_SOCKETS
62	#include "cryptlib.h"	61	#include "cryptlib.h"
		62	#include <sys/socket.h>
63		63
64	#ifndef OPENSSL_NO_SOCK	64	#ifndef OPENSSL_NO_SOCK
65		65