summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-08-14 22:41:17 +0000
committerSteve Huston <shuston@riverace.com>2007-08-14 22:41:17 +0000
commit65ce130ea2b75b2507a83bb6baf4813f6ebcb88a (patch)
tree232c80300cf2403b4e390b6148a5f0bdff896aa1
parent60f6e9fac0e8bd32650797da31cf3f4863bd23ec (diff)
downloadATCD-65ce130ea2b75b2507a83bb6baf4813f6ebcb88a.tar.gz
ChangeLogTag:Tue Aug 14 22:39:56 UTC 2007 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/configure.ac4
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6b5425ce5f9..31d395a6665 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 14 22:39:56 UTC 2007 Steve Huston <shuston@riverace.com>
+
+ * configure.ac: Run the epoll_create() check; don't just link it.
+ RHEL 3 can link it but what ACE expects generates a run-time error.
+
Tue Aug 14 19:11:06 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
* protocols/ace/HTBP/HTBP_Channel.cpp:
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 4b9bacaea96..540430ca1e4 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -3934,13 +3934,13 @@ case "$host" in
ACE_CACHE_CHECK([for epoll_create],
[ace_cv_linux_event_poll],
[
- AC_LINK_IFELSE([
+ AC_RUN_IFELSE([
AC_LANG_PROGRAM([
#include <sys/epoll.h>
],
[
int const ACE_NUM_DESCRIPTORS = 10;
-(void) epoll_create (ACE_NUM_DESCRIPTORS);
+return epoll_create (ACE_NUM_DESCRIPTORS) == -1 ? -1 : 0;
])
],
[