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 @@ +20070927 + - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if + we don't have <poll.h> (eq QNX). From bacon at cs nyu edu. + 20070921 - (djm) [atomicio.c] Fix spin avoidance for platforms that define EWOULDBLOCK; patch from ben AT psc.edu @@ -3262,4 +3266,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4758 2007/09/21 03:12:49 djm Exp $ +$Id: ChangeLog,v 1.4759 2007/09/26 21:00:09 dtucker Exp $ @@ -34,6 +34,10 @@ #include <errno.h> #ifdef HAVE_POLL_H #include <poll.h> +#else +# ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +# endif #endif #include <string.h> #include <unistd.h> diff --git a/configure.ac b/configure.ac index b06114b5..7ef93c7d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.384 2007/09/10 23:24:18 tim Exp $ +# $Id: configure.ac,v 1.385 2007/09/26 21:00:09 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.384 $) +AC_REVISION($Revision: 1.385 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -223,6 +223,7 @@ AC_CHECK_HEADERS( \ sys/dir.h \ sys/mman.h \ sys/ndir.h \ + sys/poll.h \ sys/prctl.h \ sys/pstat.h \ sys/select.h \ |