diff --git a/ChangeLog b/ChangeLog index 367bf2c65..c77d5d8fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20080229 + - (dtucker) [openbsd-compat/bsd-poll.c] We don't check for select(2) in + configure (and there's not much point, as openssh won't work without it) + so HAVE_SELECT is not defined and the poll(2) compat code doesn't get + built in. Remove HAVE_SELECT so we can build on platforms without poll. + 20080228 - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes linking problems on AIX with gcc 4.1.x. @@ -3644,4 +3650,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.4846 2008/02/28 12:20:48 dtucker Exp $ +$Id: ChangeLog,v 1.4847 2008/02/29 02:57:47 dtucker Exp $ diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c index 836882eea..85603eab6 100644 --- a/openbsd-compat/bsd-poll.c +++ b/openbsd-compat/bsd-poll.c @@ -1,4 +1,4 @@ -/* $Id: bsd-poll.c,v 1.1 2007/06/25 12:15:13 dtucker Exp $ */ +/* $Id: bsd-poll.c,v 1.2 2008/02/29 02:57:47 dtucker Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). @@ -17,7 +17,7 @@ */ #include "includes.h" -#if !defined(HAVE_POLL) && defined(HAVE_SELECT) +#if !defined(HAVE_POLL) #ifdef HAVE_SYS_SELECT_H # include