| commit | 0abd6f2eb6eeb1a780f9f37bcdc4ebf5298d8cb8 | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@chromium.org> | Fri Dec 04 21:49:53 2015 -0500 |
| committer | Adam Langley <agl@google.com> | Tue Dec 15 20:32:36 2015 +0000 |
| tree | a97f4ee838f8fdc185c75be05aae17eb98391ca9 | |
| parent | 1246670caae72d22ff20b68b4362440c96253859 [diff] |
Get struct timeval from sys/time.h. The naclports patch switches sys/types.h to sys/time.h. Per http://pubs.opengroup.org/onlinepubs/009604499/basedefs/sys/time.h.html this is correct. Change-Id: If6d56cb28fa16a1d8b4515a45532434f6c23a29d Reviewed-on: https://boringssl-review.googlesource.com/6624 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/internal.h b/ssl/internal.h index dde605b..61038b7 100644 --- a/ssl/internal.h +++ b/ssl/internal.h
@@ -155,7 +155,7 @@ #include <winsock2.h> #pragma warning(pop) #else -#include <sys/types.h> +#include <sys/time.h> #endif
diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index 6c5c31b..ee76aea 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc
@@ -20,7 +20,7 @@ #include <netinet/tcp.h> #include <signal.h> #include <sys/socket.h> -#include <sys/types.h> +#include <sys/time.h> #include <unistd.h> #else #include <io.h> @@ -33,7 +33,6 @@ #endif #include <string.h> -#include <sys/types.h> #include <openssl/bio.h> #include <openssl/buf.h>