Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4770B6F7B for ; Wed, 1 Jun 2011 15:25:42 +0000 (UTC) Received: (qmail 34814 invoked by uid 500); 1 Jun 2011 15:25:42 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 34770 invoked by uid 500); 1 Jun 2011 15:25:42 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 34763 invoked by uid 99); 1 Jun 2011 15:25:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 15:25:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 15:25:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE4D72388A19; Wed, 1 Jun 2011 15:25:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1130186 - /httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c Date: Wed, 01 Jun 2011 15:25:20 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110601152520.EE4D72388A19@eris.apache.org> Author: covener Date: Wed Jun 1 15:25:20 2011 New Revision: 1130186 URL: http://svn.apache.org/viewvc?rev=1130186&view=rev Log: PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads. Submitted By: Philupp Reviewed By: covener Modified: httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c Modified: httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c?rev=1130186&r1=1130185&r2=1130186&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c (original) +++ httpd/httpd/trunk/modules/ldap/ap_ldap_rebind.c Wed Jun 1 15:25:20 2011 @@ -75,11 +75,11 @@ LDAP_DECLARE(apr_status_t) ap_ldap_rebin 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); }