diff options
| author | miod <> | 2014-04-13 15:25:35 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-13 15:25:35 +0000 |
| commit | 1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a (patch) | |
| tree | 74f4ff344980894c7c9ceeab9b81176ac7572566 /src/lib/libssl/dtls1.h | |
| parent | 92349eb53934e1b3e9b807e603d45417a6320d21 (diff) | |
| download | openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.tar.gz openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.tar.bz2 openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.zip | |
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'src/lib/libssl/dtls1.h')
| -rw-r--r-- | src/lib/libssl/dtls1.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h index 5008bf6081..e65d501191 100644 --- a/src/lib/libssl/dtls1.h +++ b/src/lib/libssl/dtls1.h | |||
| @@ -57,8 +57,8 @@ | |||
| 57 | * | 57 | * |
| 58 | */ | 58 | */ |
| 59 | 59 | ||
| 60 | #ifndef HEADER_DTLS1_H | 60 | #ifndef HEADER_DTLS1_H |
| 61 | #define HEADER_DTLS1_H | 61 | #define HEADER_DTLS1_H |
| 62 | 62 | ||
| 63 | #include <openssl/buffer.h> | 63 | #include <openssl/buffer.h> |
| 64 | #include <openssl/pqueue.h> | 64 | #include <openssl/pqueue.h> |
| @@ -72,8 +72,12 @@ | |||
| 72 | #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) | 72 | #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) |
| 73 | #include <sys/timeval.h> | 73 | #include <sys/timeval.h> |
| 74 | #else | 74 | #else |
| 75 | #if defined(OPENSSL_SYS_VXWORKS) | ||
| 76 | #include <sys/times.h> | ||
| 77 | #else | ||
| 75 | #include <sys/time.h> | 78 | #include <sys/time.h> |
| 76 | #endif | 79 | #endif |
| 80 | #endif | ||
| 77 | 81 | ||
| 78 | #ifdef __cplusplus | 82 | #ifdef __cplusplus |
| 79 | extern "C" { | 83 | extern "C" { |