Return-Path: Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Delivered-To: mailing list commits@apr.apache.org Received: (qmail 87612 invoked by uid 99); 5 Jan 2005 19:51:38 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 05 Jan 2005 11:51:37 -0800 Received: (qmail 40345 invoked by uid 65534); 5 Jan 2005 19:51:36 -0000 Date: 5 Jan 2005 19:51:36 -0000 Message-ID: <20050105195136.40329.qmail@minotaur.apache.org> From: wrowe@apache.org To: commits@apr.apache.org Subject: svn commit: r124258 - /apr/apr-util/trunk/ldap/apr_ldap_init.c /apr/apr-util/trunk/ldap/apr_ldap_url.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked Author: wrowe Date: Wed Jan 5 11:51:35 2005 New Revision: 124258 URL: http://svn.apache.org/viewcvs?view=rev&rev=124258 Log: Quit using unique #include conventions. Also solve misc Win32 (possibly netware) build issues, as some platforms need apr.h/apu.h before anything else is included. Modified: apr/apr-util/trunk/ldap/apr_ldap_init.c apr/apr-util/trunk/ldap/apr_ldap_url.c Modified: apr/apr-util/trunk/ldap/apr_ldap_init.c Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_init.c?view=diff&rev=124258&p1=apr/apr-util/trunk/ldap/apr_ldap_init.c&r1=124257&p2=apr/apr-util/trunk/ldap/apr_ldap_init.c&r2=124258 ============================================================================== --- apr/apr-util/trunk/ldap/apr_ldap_init.c (original) +++ apr/apr-util/trunk/ldap/apr_ldap_init.c Wed Jan 5 11:51:35 2005 @@ -21,11 +21,12 @@ * Copyright 1999-2001 Dave Carrigan */ -#include -#include -#include -#include -#include +#include "apr.h" +#include "apu.h" +#include "apr_ldap.h" +#include "apr_errno.h" +#include "apr_pools.h" +#include "apr_strings.h" #if APR_HAS_LDAP Modified: apr/apr-util/trunk/ldap/apr_ldap_url.c Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_url.c?view=diff&rev=124258&p1=apr/apr-util/trunk/ldap/apr_ldap_url.c&r1=124257&p2=apr/apr-util/trunk/ldap/apr_ldap_url.c&r2=124258 ============================================================================== --- apr/apr-util/trunk/ldap/apr_ldap_url.c (original) +++ apr/apr-util/trunk/ldap/apr_ldap_url.c Wed Jan 5 11:51:35 2005 @@ -69,6 +69,9 @@ * Tolerates URLs that look like: and */ +#include "apu.h" +#include "apr_pools.h" +#include "apr_strings.h" #include "apr_ldap.h" #if APR_HAS_LDAP @@ -76,10 +79,6 @@ #if APR_HAVE_STDLIB_H #include #endif - -#include "apu.h" -#include "apr_pools.h" -#include "apr_strings.h" #ifndef LDAPS_PORT #define LDAPS_PORT 636 /* ldaps:/// default LDAP over TLS port */