From: Stefan Fritsch Date: Sat, 23 Jul 2011 17:18:15 +0000 (+0000) Subject: Revert r1130186: X-Git-Tag: 2.3.14^2~30^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b5d740f80b8bfd8868d9f5128a83f45f187fab;p=thirdparty%2Fapache%2Fhttpd.git Revert r1130186: PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150166 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ldap/ap_ldap_rebind.c b/modules/ldap/ap_ldap_rebind.c index 1c7c05957b6..230986ef6be 100644 --- a/modules/ldap/ap_ldap_rebind.c +++ b/modules/ldap/ap_ldap_rebind.c @@ -75,11 +75,11 @@ LDAP_DECLARE(apr_status_t) ap_ldap_rebind_init(apr_pool_t *pool) get_apd #endif -#if APR_HAS_THREADS /* run after apr_thread_mutex_create cleanup */ apr_pool_cleanup_register(pool, &ap_ldap_xref_lock, ap_ldap_pool_cleanup_set_null, apr_pool_cleanup_null); +#if APR_HAS_THREADS if (ap_ldap_xref_lock == NULL) { retcode = apr_thread_mutex_create(&ap_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool); }