summaryrefslogtreecommitdiff
path: root/monitor_fdpass.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
committerColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
commit487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (patch)
treea2cff6fec1e6c4b4153a170a3e172cfe6bfdec46 /monitor_fdpass.c
parent796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (diff)
parent28453d58058a4d60c3ebe7d7f0c31a510cbf6158 (diff)
Import openssh_6.7p1.orig.tar.gz
Diffstat (limited to 'monitor_fdpass.c')
-rw-r--r--monitor_fdpass.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 7eb6f5c6e..100fa5660 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -34,12 +34,17 @@
34#endif 34#endif
35 35
36#include <errno.h> 36#include <errno.h>
37#ifdef HAVE_POLL_H
38#include <poll.h>
39#endif
40#include <string.h> 37#include <string.h>
41#include <stdarg.h> 38#include <stdarg.h>
42 39
40#ifdef HAVE_POLL_H
41# include <poll.h>
42#else
43# ifdef HAVE_SYS_POLL_H
44# include <sys/poll.h>
45# endif
46#endif
47
43#include "log.h" 48#include "log.h"
44#include "monitor_fdpass.h" 49#include "monitor_fdpass.h"
45 50