summaryrefslogtreecommitdiffstats
path: root/scp.c
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2008-03-14 01:59:50 +0100
committerTim Rice <tim@multitalents.net>2008-03-14 01:59:50 +0100
commit3eb144911c149c293bf681bec7da649a8d33d420 (patch)
tree2165052a9f2b5eb82059cfa32924fc67d681af67 /scp.c
parent - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and (diff)
downloadopenssh-3eb144911c149c293bf681bec7da649a8d33d420.tar.xz
openssh-3eb144911c149c293bf681bec7da649a8d33d420.zip
- (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
by vinschen at redhat.com.
Diffstat (limited to '')
-rw-r--r--scp.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index 1734da8f4..c047864aa 100644
--- a/scp.c
+++ b/scp.c
@@ -78,8 +78,12 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+# include <sys/poll.h>
+# endif
#endif
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>