Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 50426 invoked from network); 23 May 2004 21:49:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 23 May 2004 21:49:25 -0000 Received: (qmail 12074 invoked by uid 500); 23 May 2004 21:49:19 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 12008 invoked by uid 500); 23 May 2004 21:49:19 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 11990 invoked by uid 98); 23 May 2004 21:49:18 -0000 Received: from minfrin@sharp.fm by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(196.30.143.210):. Processed in 2.017539 secs); 23 May 2004 21:49:18 -0000 X-Qmail-Scanner-Mail-From: minfrin@sharp.fm via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(196.30.143.210):. Processed in 2.017539 secs) Received: from unknown (HELO gatekeeper.fma.co.za) (196.30.143.210) by hermes.apache.org with SMTP; 23 May 2004 21:49:16 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by gatekeeper.fma.co.za (Postfix) with ESMTP id 669C43574E; Sun, 23 May 2004 23:48:58 +0200 (SAST) Received: from gatekeeper.fma.co.za ([127.0.0.1]) by localhost (gatekeeper.fma.co.za [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07063-06; Sun, 23 May 2004 23:48:57 +0200 (SAST) Received: from sharp.fm (gatekeeper.fma.co.za [196.30.143.210]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gatekeeper.fma.co.za (Postfix) with ESMTP id A64C3354DC; Sun, 23 May 2004 23:48:52 +0200 (SAST) Message-ID: <40B11C44.1080505@sharp.fm> Date: Sun, 23 May 2004 23:48:52 +0200 From: Graham Leggett User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040514 X-Accept-Language: en-za, en-us, en MIME-Version: 1.0 To: dev@httpd.apache.org, APR Development Subject: [Patch] swap ldap.h headers - PR 27379 Content-Type: multipart/mixed; boundary="------------020205070707080203050209" X-Virus-Scanned: by amavisd-new at fma.co.za X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------020205070707080203050209 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi all, The above bug was posted about LDAP support not building on Solaris due to ldap.h and lber.h being declared in the wrong order. This patch has been committed to apr-util v1.0, what needs to be done to get it committed to apr-util v0.9? Regards, Graham -- --------------020205070707080203050209 Content-Type: text/plain; name="ldap-swap.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ldap-swap.patch" --- httpd-2.0/srclib/apr-util/include/apr_ldap.h.in 2004-02-27 00:03:46.000000000 +0200 +++ httpd-2.1/srclib/apr-util/include/apr_ldap.h.in 2004-05-22 02:44:30.000000000 +0200 @@ -95,36 +95,27 @@ /* LDAP header files */ #if APR_HAS_NETSCAPE_LDAPSDK -@ldap_h@ @lber_h@ +@ldap_h@ #if APR_HAS_LDAP_SSL @ldap_ssl_h@ #endif #endif #if APR_HAS_NOVELL_LDAPSDK -@ldap_h@ @lber_h@ +@ldap_h@ #if APR_HAS_LDAP_SSL @ldap_ssl_h@ #endif #endif #if APR_HAS_OPENLDAP_LDAPSDK -@ldap_h@ @lber_h@ +@ldap_h@ #endif /* LDAPv2 SDKs don't use const parameters in their prototypes. --------------020205070707080203050209--