From: tim <tim>
Date: Fri, 14 Mar 2008 00:59:50 +0000 (+0000)
Subject:  - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
X-Git-Tag: V_4_9_P1~25
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/af8388bc30635c5edea272856d8bfe0fc5956665

 - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
   by vinschen at redhat.com.
---

diff --git a/ChangeLog b/ChangeLog
index a08351bd..c45329cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    self: make changes to Makefile.in next time, not the generated Makefile).
  - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
    puttygen(1) by $PATH
+ - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
+   by vinschen at redhat.com.
 
 20080312
  - (djm) OpenBSD CVS Sync
diff --git a/scp.c b/scp.c
index 1734da8f..c047864a 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>