- (djm) [monitor_fdpass.c] Use sys/poll.h if poll.h doesn't exist;

bz#2237
This commit is contained in:
Damien Miller 2014-07-03 13:29:50 +10:00
parent 8da0fa2493
commit 9eb4cd9a32
2 changed files with 10 additions and 3 deletions

View File

@ -1,6 +1,8 @@
20140703 20140703
- (djm) [digest-openssl.c configure.ac] Disable RIPEMD160 if libcrypto - (djm) [digest-openssl.c configure.ac] Disable RIPEMD160 if libcrypto
doesn't support it. doesn't support it.
- (djm) [monitor_fdpass.c] Use sys/poll.h if poll.h doesn't exist;
bz#2237
20140702 20140702
- OpenBSD CVS Sync - OpenBSD CVS Sync

View File

@ -34,12 +34,17 @@
#endif #endif
#include <errno.h> #include <errno.h>
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <string.h> #include <string.h>
#include <stdarg.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 "log.h"
#include "monitor_fdpass.h" #include "monitor_fdpass.h"