From: Andy Polyakov <appro@openssl.org>
Date: Thu, 4 Feb 2016 21:01:23 +0000 (+0100)
Subject: bio/b_sock.c: cleanup obsolete stuff.
X-Git-Tag: OpenSSL_1_1_0-pre3~211
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f0c9d5cdf8a7eee73a3fde4f626b53434d04f91;p=oweals%2Fopenssl.git

bio/b_sock.c: cleanup obsolete stuff.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 567ee4824d..3e17bec14a 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -64,7 +64,6 @@
 NETDB_DEFINE_CONTEXT
 #endif
 #ifndef OPENSSL_NO_SOCK
-# include <openssl/dso.h>
 # define SOCKET_PROTOCOL IPPROTO_TCP
 # ifdef SO_MAXCONN
 #  define MAX_LISTEN  SO_MAXCONN
@@ -77,17 +76,6 @@ NETDB_DEFINE_CONTEXT
 static int wsa_init_done = 0;
 # endif
 
-/*
- * WSAAPI specifier is required to make indirect calls to run-time
- * linked WinSock 2 functions used in this module, to be specific
- * [get|free]addrinfo and getnameinfo. This is because WinSock uses
- * uses non-C calling convention, __stdcall vs. __cdecl, on x86
- * Windows. On non-WinSock platforms WSAAPI needs to be void.
- */
-# ifndef WSAAPI
-#  define WSAAPI
-# endif
-
 # if OPENSSL_API_COMPAT < 0x10100000L
 int BIO_get_host_ip(const char *str, unsigned char *ip)
 {