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 /test/ossl_shim/packeted_bio.h | |
| parent | 75551e07bd2339dfea06ef1d31d69929e13a4495 (diff) | |
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 'test/ossl_shim/packeted_bio.h')
| -rw-r--r-- | test/ossl_shim/packeted_bio.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h index afdba1300a..9b4fb1d4d2 100644 --- a/test/ossl_shim/packeted_bio.h +++ b/test/ossl_shim/packeted_bio.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,18 +10,10 @@ #ifndef HEADER_PACKETED_BIO #define HEADER_PACKETED_BIO +#include "e_os.h" #include <openssl/base.h> #include <openssl/bio.h> -#if defined(OPENSSL_SYS_WINDOWS) -OPENSSL_MSVC_PRAGMA(warning(push, 3)) -#include <winsock2.h> -OPENSSL_MSVC_PRAGMA(warning(pop)) -#else -#include <sys/time.h> -#endif - - // PacketedBioCreate creates a filter BIO which implements a reliable in-order // blocking datagram socket. It internally maintains a clock and honors // |BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT| based on it. |