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 733E9D70A for ; Mon, 12 Nov 2012 18:55:06 +0000 (UTC) Received: (qmail 35332 invoked by uid 500); 12 Nov 2012 18:55:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 35269 invoked by uid 500); 12 Nov 2012 18:55:05 -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 35260 invoked by uid 99); 12 Nov 2012 18:55:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2012 18:55:05 +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; Mon, 12 Nov 2012 18:55:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B68D523888CD; Mon, 12 Nov 2012 18:54:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408402 - /httpd/httpd/trunk/include/util_ldap.h Date: Mon, 12 Nov 2012 18:54:44 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121112185444.B68D523888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: covener Date: Mon Nov 12 18:54:43 2012 New Revision: 1408402 URL: http://svn.apache.org/viewvc?rev=1408402&view=rev Log: followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included Modified: httpd/httpd/trunk/include/util_ldap.h Modified: httpd/httpd/trunk/include/util_ldap.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_ldap.h?rev=1408402&r1=1408401&r2=1408402&view=diff ============================================================================== --- httpd/httpd/trunk/include/util_ldap.h (original) +++ httpd/httpd/trunk/include/util_ldap.h Mon Nov 12 18:54:43 2012 @@ -45,7 +45,7 @@ /* this whole thing disappears if LDAP is not enabled */ #if APR_HAS_LDAP -#ifdef LDAP_UNAVAILABLE +#if defined(LDAP_UNAVAILABLE) || APR_HAS_MICROSOFT_LDAPSDK #define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \ ||(s) == LDAP_UNAVAILABLE) #else