- (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.
This commit is contained in:
Darren Tucker 2007-09-27 07:00:09 +10:00
parent ed626b42cc
commit 7c92a65a1d
3 changed files with 12 additions and 3 deletions

View File

@ -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 20070921
- (djm) [atomicio.c] Fix spin avoidance for platforms that define - (djm) [atomicio.c] Fix spin avoidance for platforms that define
EWOULDBLOCK; patch from ben AT psc.edu EWOULDBLOCK; patch from ben AT psc.edu
@ -3262,4 +3266,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

View File

@ -34,6 +34,10 @@
#include <errno.h> #include <errno.h>
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
#else
# ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
# endif
#endif #endif
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 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_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -223,6 +223,7 @@ AC_CHECK_HEADERS( \
sys/dir.h \ sys/dir.h \
sys/mman.h \ sys/mman.h \
sys/ndir.h \ sys/ndir.h \
sys/poll.h \
sys/prctl.h \ sys/prctl.h \
sys/pstat.h \ sys/pstat.h \
sys/select.h \ sys/select.h \