diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-11-08 21:12:58 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-11-08 21:12:58 +1100 |
commit | 8c333ec23bdf7da917aa20ac6803a2cdd79182c5 (patch) | |
tree | 2faacec378021217e28ad7e7d8cd0efb7d69897e | |
parent | d94240b2f6b376b6e9de187e4a0cd4b89dfc48cb (diff) |
- (dtucker) [openbsd-compat/bsd-poll.c] Add headers to prevent compile
warnings.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-poll.c | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -24,6 +24,8 @@ | |||
24 | - (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have | 24 | - (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have |
25 | EVP_sha256. | 25 | EVP_sha256. |
26 | - (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256. | 26 | - (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256. |
27 | - (dtucker) [openbsd-compat/bsd-poll.c] Add headers to prevent compile | ||
28 | warnings. | ||
27 | 29 | ||
28 | 20131107 | 30 | 20131107 |
29 | - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) | 31 | - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) |
diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c index f899d7a24..c7ef82776 100644 --- a/openbsd-compat/bsd-poll.c +++ b/openbsd-compat/bsd-poll.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-poll.c,v 1.4 2008/08/29 21:32:38 dtucker Exp $ */ | 1 | /* $Id: bsd-poll.c,v 1.5 2013/11/08 10:12:58 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). | 4 | * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). |
@@ -19,12 +19,15 @@ | |||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | #if !defined(HAVE_POLL) | 20 | #if !defined(HAVE_POLL) |
21 | 21 | ||
22 | #include <sys/types.h> | ||
23 | #include <sys/time.h> | ||
22 | #ifdef HAVE_SYS_SELECT_H | 24 | #ifdef HAVE_SYS_SELECT_H |
23 | # include <sys/select.h> | 25 | # include <sys/select.h> |
24 | #endif | 26 | #endif |
25 | 27 | ||
26 | #include <stdlib.h> | ||
27 | #include <errno.h> | 28 | #include <errno.h> |
29 | #include <stdlib.h> | ||
30 | #include <unistd.h> | ||
28 | #include "bsd-poll.h" | 31 | #include "bsd-poll.h" |
29 | 32 | ||
30 | /* | 33 | /* |