summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2005-03-15 22:53:10 +0000
committerpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2005-03-15 22:53:10 +0000
commit322b2ea378a6f3b75993614ecff5509a3c974ad2 (patch)
treeff6eee7e3a11520ebe789eca690edf7404d1be71
parentd52b1ca9302eef0aaec2b3db788810d71c13b17a (diff)
downloadlibapr-322b2ea378a6f3b75993614ecff5509a3c974ad2.tar.gz
Backport r151487 from trunk to fix rwlock detection.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.1.x@157603 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES2
-rw-r--r--configure.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 4030d06c4..7d9d57ca7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
Changes for APR 1.1.1
+ *) Fix posix rwlock detection on Darwin. [Aaron Bannert]
+
*) Build fix for Multicast support on HP-UX 11.00 and Tru64 [Joe Orton]
*) Fix libapr.rc for Win32 builds [William Rowe]
diff --git a/configure.in b/configure.in
index 1ed4f7d1c..48d22b71f 100644
--- a/configure.in
+++ b/configure.in
@@ -603,7 +603,7 @@ else
dnl ----------------------------- Checking for pthread_rwlock_t
AC_CACHE_CHECK([for pthread_rwlock_t], [apr_cv_type_rwlock_t],
AC_TRY_COMPILE([#include <sys/types.h>
-#include <pthread.h>], [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
+#include <pthread.h>], [pthread_rwlock_t *rwlock;],
[apr_cv_type_rwlock_t=yes], [apr_cv_type_rwlock_t=no],
[apr_cv_type_rwlock_t=no]))
if test "$apr_cv_type_rwlock_t" = "yes"; then