diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-02-29 13:57:47 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-02-29 13:57:47 +1100 |
commit | 7ec87332472340d468aff0f41e0f4e99faf5dda3 (patch) | |
tree | f23817ab62901f2cd2bb5bb787a102b17a481df4 | |
parent | 1f1e17bd61850dfa74455cfad9905c6da252c4af (diff) |
- (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.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | openbsd-compat/bsd-poll.c | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20080229 | ||
2 | - (dtucker) [openbsd-compat/bsd-poll.c] We don't check for select(2) in | ||
3 | configure (and there's not much point, as openssh won't work without it) | ||
4 | so HAVE_SELECT is not defined and the poll(2) compat code doesn't get | ||
5 | built in. Remove HAVE_SELECT so we can build on platforms without poll. | ||
6 | |||
1 | 20080228 | 7 | 20080228 |
2 | - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes | 8 | - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes |
3 | linking problems on AIX with gcc 4.1.x. | 9 | linking problems on AIX with gcc 4.1.x. |
@@ -3644,4 +3650,4 @@ | |||
3644 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3650 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3645 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3651 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3646 | 3652 | ||
3647 | $Id: ChangeLog,v 1.4846 2008/02/28 12:20:48 dtucker Exp $ | 3653 | $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 @@ | |||
1 | /* $Id: bsd-poll.c,v 1.1 2007/06/25 12:15:13 dtucker Exp $ */ | 1 | /* $Id: bsd-poll.c,v 1.2 2008/02/29 02:57:47 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). | 4 | * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). |
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | #if !defined(HAVE_POLL) && defined(HAVE_SELECT) | 20 | #if !defined(HAVE_POLL) |
21 | 21 | ||
22 | #ifdef HAVE_SYS_SELECT_H | 22 | #ifdef HAVE_SYS_SELECT_H |
23 | # include <sys/select.h> | 23 | # include <sys/select.h> |