diff options
| author | Pauli <paul.dale@oracle.com> | 2017-09-01 08:50:03 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-09-01 09:55:43 +1000 |
| commit | 4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0 (patch) | |
| tree | 550e4d3cf715378bb9b609caede0a1091a816cda /ssl | |
| parent | 75551e07bd2339dfea06ef1d31d69929e13a4495 (diff) | |
| download | openssl-new-4cff10dcbfbd979d1557cc8b7e3fa2f19525deb0.tar.gz | |
struct timeval include guards
Move struct timeval includes into e_os.h (where the Windows ones were).
Enaure that the include is guarded canonically.
Refer #4271
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4312)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_lib.c | 6 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 6c594a2686..d839e1ab72 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -13,12 +13,6 @@ #include <openssl/rand.h> #include "ssl_locl.h" -#if 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); static int dtls1_handshake_write(SSL *s); static size_t dtls1_link_min_mtu(void); diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 7caec67d24..a0127cf6a0 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -11,16 +11,13 @@ #ifndef HEADER_SSL_LOCL_H # define HEADER_SSL_LOCL_H -# include "e_os.h" /* struct timeval for Windows */ + +# include "e_os.h" /* struct timeval for DTLS */ # include <stdlib.h> # include <time.h> # include <string.h> # include <errno.h> -# if defined(__unix) || defined(__unix__) -# include <sys/time.h> /* struct timeval for DTLS */ -# endif - # include <openssl/buffer.h> # include <openssl/comp.h> # include <openssl/bio.h> |