summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--poll/unix/poll.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index e9e410b41..393c3d125 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
Changes with APR 0.9.0
+ *) Fixed usage of alloca in apr_poll() on Tru64
+ [Dave Hill <ddhill@zk3.dec.com>]
+
*) Running "make check" in the toplevel directory or the test/ directory
will build and run all test programs. [Aaron Bannert]
diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index 657625d97..9a31ecaa1 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -64,6 +64,10 @@
#if HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
+#if HAVE_ALLOCA && defined(__osf__)
+/* Tru64 UNIX requires this for proper alloca operation in threaded programs */
+#include <alloca.h>
+#endif
#ifdef NETWARE
#define HAS_SOCKETS(dt) (dt == APR_POLL_SOCKET) ? 1 : 0