- (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.

diff --git a/ChangeLog b/ChangeLog
index b8401e16c42980aa47c4603d51404ca503a7d69b..b3c1446fb839bddb7d147847940c0c9b985f610f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
    configure (and there's not much point, as openssh won't work without it)
    so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
    built in.  Remove HAVE_SELECT so we can build on platforms without poll.
+ - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.
 
 20080228
  - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes

diff --git a/scp.c b/scp.c
index b35a7dd6cdae80e9944ea9302d2cfd0956049023..1734da8f4adb4d09e7c1f6074457a20a2d1238cb 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -78,7 +78,9 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+#ifdef HAVE_SYS_POLL_H
 # include <sys/poll.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif