[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  2f0c9d5cdf8a7eee73a3fde4f626b53434d04f91 (commit)
      from  6bc1dfd65150d2e3301a38a7a4eb4b23b0bab729 (commit)


- Log -----------------------------------------------------------------
commit 2f0c9d5cdf8a7eee73a3fde4f626b53434d04f91
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Feb 4 22:01:23 2016 +0100

    bio/b_sock.c: cleanup obsolete stuff.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/b_sock.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 567ee48..3e17bec 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)
 {