From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 16 Jun 2009 16:55:01 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_1_0_0-beta3~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85d9b02d160982824fc241e6ba1de02a318baf5f;p=oweals%2Fopenssl.git

Update from HEAD.
---

diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index 73af56d45c..9a0b511df6 100644
--- 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