Netware patch submitted by Verdon Walker" <VWalker@novell.com> in PR

[openssl.git] / crypto / bio / b_sock.c

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 268517fdc3d79d8b8ab35b9e706033c49fa3e262..4b3860b991e30a68694770a86b3fedc99b028b39 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -62,6 +62,9 @@
 #define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>

+#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
+#include "netdb.h"
+#endif

 
 #ifndef OPENSSL_NO_SOCK
 
 
 #ifndef OPENSSL_NO_SOCK
 


@@ -79,7 +82,7 @@
 #define MAX_LISTEN  32
 #endif
 
 #define MAX_LISTEN  32
 #endif
 

-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
+#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))

 static int wsa_init_done=0;
 #endif
 
 static int wsa_init_done=0;
 #endif
 


@@ -474,7 +477,7 @@ int BIO_sock_init(void)
                return (-1);
 #endif
 
                return (-1);
 #endif
 

-#if defined(OPENSSL_SYS_NETWARE)
+#if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)

     WORD wVerReq;
     WSADATA wsaData;
     int err;
     WORD wVerReq;
     WSADATA wsaData;
     int err;


@@ -512,7 +515,7 @@ void BIO_sock_cleanup(void)
 #endif
                WSACleanup();
                }
 #endif
                WSACleanup();
                }

-#elif defined(OPENSSL_SYS_NETWARE)
+#elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)

    if (wsa_init_done)
         {
         wsa_init_done=0;
    if (wsa_init_done)
         {
         wsa_init_done=0;