diff options
| author | djm <djm> | 2014-07-03 03:29:50 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-07-03 03:29:50 +0000 |
| commit | 68b5488a048042b94170682d25d3c04358543bc7 (patch) | |
| tree | baa38707ea6b316337cfe0b1f7f16892d01ad5b7 | |
| parent | ff2ba6a4721c7fdb4b50fba111942b4f8f383048 (diff) | |
| download | openssh-68b5488a048042b94170682d25d3c04358543bc7.tar.gz | |
- (djm) [monitor_fdpass.c] Use sys/poll.h if poll.h doesn't exist;
bz#2237
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | monitor_fdpass.c | 11 |
2 files changed, 10 insertions, 3 deletions
@@ -1,6 +1,8 @@ 20140703 - (djm) [digest-openssl.c configure.ac] Disable RIPEMD160 if libcrypto doesn't support it. + - (djm) [monitor_fdpass.c] Use sys/poll.h if poll.h doesn't exist; + bz#2237 20140702 - OpenBSD CVS Sync diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 7eb6f5c6..100fa566 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -34,12 +34,17 @@ #endif #include <errno.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#endif #include <string.h> #include <stdarg.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#else +# ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +# endif +#endif + #include "log.h" #include "monitor_fdpass.h" |