commit 2e749e8f61ff000828095765762289a45e1d4f4f
author David Benjamin <davidben@chromium.org> Tue Apr 07 23:20:51 2015 -0400
committer Adam Langley <agl@google.com> Fri Apr 10 22:15:19 2015 +0000
tree 908674720cccf0bc3b160773d5eaccd043ed1547
parent f0ae1700215c03baea9acc9be4d0c0e047cfac46

Move the sys/time.h #include out of extern C.

We shouldn't be wrapping system headers.

Change-Id: I77498f4ec869797050b276eb764d892f73782f9f
Reviewed-on: https://boringssl-review.googlesource.com/4282
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index b374d1f..6149d44 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -152,6 +152,10 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 
+#if !defined(OPENSSL_WINDOWS)
+#include <sys/time.h>
+#endif
+
 /* Some code expected to get the threading functions by including ssl.h. */
 #include <openssl/thread.h>
 
@@ -368,7 +372,6 @@
   long tv_usec;
 } OPENSSL_timeval;
 #else
-#include <sys/time.h>
 typedef struct timeval OPENSSL_timeval;
 #endif