diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-09-27 07:00:09 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-09-27 07:00:09 +1000 |
commit | 7c92a65a1d0feaa9712aa0542fe44455d621397a (patch) | |
tree | 1f5dfa29ad4b378484f5d9a15b609c993b43c351 | |
parent | ed626b42cc4414235fc2181cc139362e5e054b04 (diff) |
- (dtucker) [configure.ac atomicio.c] Fall back to <sys/poll.h> if we don't
have <poll.h> (eq QNX). From bacon at cs nyu edu.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | atomicio.c | 4 | ||||
-rw-r--r-- | configure.ac | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20070927 | ||
2 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if | ||
3 | we don't have <poll.h> (eq QNX). From bacon at cs nyu edu. | ||
4 | |||
1 | 20070921 | 5 | 20070921 |
2 | - (djm) [atomicio.c] Fix spin avoidance for platforms that define | 6 | - (djm) [atomicio.c] Fix spin avoidance for platforms that define |
3 | EWOULDBLOCK; patch from ben AT psc.edu | 7 | EWOULDBLOCK; patch from ben AT psc.edu |
@@ -3262,4 +3266,4 @@ | |||
3262 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3266 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3263 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3267 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3264 | 3268 | ||
3265 | $Id: ChangeLog,v 1.4758 2007/09/21 03:12:49 djm Exp $ | 3269 | $Id: ChangeLog,v 1.4759 2007/09/26 21:00:09 dtucker Exp $ |
diff --git a/atomicio.c b/atomicio.c index 62ee40282..575bf8900 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -34,6 +34,10 @@ | |||
34 | #include <errno.h> | 34 | #include <errno.h> |
35 | #ifdef HAVE_POLL_H | 35 | #ifdef HAVE_POLL_H |
36 | #include <poll.h> | 36 | #include <poll.h> |
37 | #else | ||
38 | # ifdef HAVE_SYS_POLL_H | ||
39 | # include <sys/poll.h> | ||
40 | # endif | ||
37 | #endif | 41 | #endif |
38 | #include <string.h> | 42 | #include <string.h> |
39 | #include <unistd.h> | 43 | #include <unistd.h> |
diff --git a/configure.ac b/configure.ac index b06114b5b..7ef93c7d0 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.384 2007/09/10 23:24:18 tim Exp $ | 1 | # $Id: configure.ac,v 1.385 2007/09/26 21:00:09 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.384 $) | 18 | AC_REVISION($Revision: 1.385 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -223,6 +223,7 @@ AC_CHECK_HEADERS( \ | |||
223 | sys/dir.h \ | 223 | sys/dir.h \ |
224 | sys/mman.h \ | 224 | sys/mman.h \ |
225 | sys/ndir.h \ | 225 | sys/ndir.h \ |
226 | sys/poll.h \ | ||
226 | sys/prctl.h \ | 227 | sys/prctl.h \ |
227 | sys/pstat.h \ | 228 | sys/pstat.h \ |
228 | sys/select.h \ | 229 | sys/select.h \ |