summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-09-27 20:43:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-09-27 20:43:48 +1000
commitcba3b437786443528db085817b19b244ffa649d2 (patch)
treebaccdcaae18419779ec4b5ca709649d3a81edbfa
parentf62ab0fbd6a4aa7f4dfc332c9f96673e0e716c85 (diff)
- (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.
-rw-r--r--ChangeLog6
-rw-r--r--atomicio.c4
-rw-r--r--configure.ac5
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a27eec13..80526913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
20070917
- (tim) [defines.h] Fix regression in long password support on OpenServer 6.
Problem report and additional testing rac AT tenzing.org.
@@ -3192,4 +3196,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.4738.2.3 2007/09/17 15:33:47 tim Exp $
+$Id: ChangeLog,v 1.4738.2.4 2007/09/27 10:43:48 dtucker Exp $
diff --git a/atomicio.c b/atomicio.c
index f32ff85b..b9f68254 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -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 2dc0b5b3..e11f4203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.383.2.1 2007/09/10 23:25:17 tim Exp $
+# $Id: configure.ac,v 1.383.2.2 2007/09/27 10:43:49 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.383.2.1 $)
+AC_REVISION($Revision: 1.383.2.2 $)
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 \