fix PR#2261 in a different way

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 3fbfe8e0ba69c3badc359d1057542dc3a21f0587..5ceeeeb950d6f9132deac10407078d10a294394c 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -150,7 +150,6 @@ extern "C" {
 #define clear_socket_error()   WSASetLastError(0)
 #define readsocket(s,b,n)      recv((s),(b),(n),0)
 #define writesocket(s,b,n)     send((s),(b),(n),0)
-#define EADDRINUSE             WSAEADDRINUSE
 #elif defined(__DJGPP__)
 #define WATT32
 #define get_last_socket_error()        errno
@@ -624,6 +623,18 @@ static unsigned int _strlen31(const char *str)
 #    define INVALID_SOCKET     (-1)
 #    endif /* INVALID_SOCKET */
 #  endif
+
+/* Some IPv6 implementations are broken, disable them in known bad
+ * versions.
+ */
+#  if !defined(OPENSSL_USE_IPV6)
+#    if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB)
+#      define OPENSSL_USE_IPV6 1
+#    else
+#      define OPENSSL_USE_IPV6 0
+#    endif
+#  endif
+
 #endif
 
 #if defined(__ultrix)