From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 22 Jun 2009 10:32:27 +0000 (+0000)
Subject: Ooops, apply PR #1946 to 0.9.8 too.
X-Git-Tag: OpenSSL_0_9_8m-beta1~190
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6daac534d7733879bdb6b48fdd2fd6a911a3fbe4;p=oweals%2Fopenssl.git

Ooops, apply PR #1946 to 0.9.8 too.
---

diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index 03774ec7e4..8f81edc7a5 100644
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -65,8 +65,10 @@
 #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>
+#else
+#include <sys/time.h>
 #endif
 
 #ifdef  __cplusplus