diff options
author | Tim Rice <tim@multitalents.net> | 2008-03-13 17:59:50 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2008-03-13 17:59:50 -0700 |
commit | 3eb144911c149c293bf681bec7da649a8d33d420 (patch) | |
tree | 2165052a9f2b5eb82059cfa32924fc67d681af67 | |
parent | c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa (diff) |
- (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
by vinschen at redhat.com.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.c | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -3,6 +3,8 @@ | |||
3 | self: make changes to Makefile.in next time, not the generated Makefile). | 3 | self: make changes to Makefile.in next time, not the generated Makefile). |
4 | - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and | 4 | - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and |
5 | puttygen(1) by $PATH | 5 | puttygen(1) by $PATH |
6 | - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch | ||
7 | by vinschen at redhat.com. | ||
6 | 8 | ||
7 | 20080312 | 9 | 20080312 |
8 | - (djm) OpenBSD CVS Sync | 10 | - (djm) OpenBSD CVS Sync |
@@ -3746,4 +3748,4 @@ | |||
3746 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3748 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3747 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3749 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3748 | 3750 | ||
3749 | $Id: ChangeLog,v 1.4872 2008/03/13 01:41:31 djm Exp $ | 3751 | $Id: ChangeLog,v 1.4873 2008/03/14 00:59:50 tim Exp $ |
@@ -78,8 +78,12 @@ | |||
78 | #ifdef HAVE_SYS_STAT_H | 78 | #ifdef HAVE_SYS_STAT_H |
79 | # include <sys/stat.h> | 79 | # include <sys/stat.h> |
80 | #endif | 80 | #endif |
81 | #ifdef HAVE_SYS_POLL_H | 81 | #ifdef HAVE_POLL_H |
82 | # include <sys/poll.h> | 82 | #include <poll.h> |
83 | #else | ||
84 | # ifdef HAVE_SYS_POLL_H | ||
85 | # include <sys/poll.h> | ||
86 | # endif | ||
83 | #endif | 87 | #endif |
84 | #ifdef HAVE_SYS_TIME_H | 88 | #ifdef HAVE_SYS_TIME_H |
85 | # include <sys/time.h> | 89 | # include <sys/time.h> |