aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/d1_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-04-30 09:40:55 +0100
committerMatt Caswell <matt@openssl.org>2015-04-30 11:34:51 +0100
commitfb456902758d1c9a36ebb1327e81e98e53c26df6 (patch)
tree96bc4d87a42fd89a5ae8099742df8579cd6075cc /ssl/d1_lib.c
parent995101d6547c9bc88e10fc85cfa2cbc3a92ede93 (diff)
downloadopenssl-fb456902758d1c9a36ebb1327e81e98e53c26df6.tar.gz
Remove redundant includes from dtls1.h
There were a set of includes in dtls1.h which are now redundant due to the libssl opaque work. This commit removes those includes, which also has the effect of resolving one issue preventing building on windows (i.e. the include of winsock.h) Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'ssl/d1_lib.c')
-rw-r--r--ssl/d1_lib.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index a1d203223c..6946b32dea 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -64,6 +64,12 @@
#if defined(OPENSSL_SYS_VMS)
# include <sys/timeb.h>
+#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
+# include <sys/timeval.h>
+#elif defined(OPENSSL_SYS_VXWORKS)
+# include <sys/times.h>
+#elif !defined(OPENSSL_SYS_WIN32)
+# include <sys/time.h>
#endif
static void get_current_time(struct timeval *t);