Update from HEAD.

diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index 73af56d45c14a022ee9ee40912f6828f671c4be5..9a0b511df6b0a1fa588ebb9567d725952004159a 100644 (file)
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -65,7 +65,7 @@
 #ifdef OPENSSL_SYS_WIN32
 /* Needed for struct timeval */
 #include <winsock.h>
-#elif defined(OPENSSL_SYS_NETWARE)
+#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
 #include <sys/timeval.h>
 #endif