From commits-return-10030-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Tue Nov 25 18:18:03 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 8958 invoked from network); 25 Nov 2008 18:18:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2008 18:18:03 -0000 Received: (qmail 74554 invoked by uid 500); 25 Nov 2008 18:18:14 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 74506 invoked by uid 500); 25 Nov 2008 18:18:14 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 74497 invoked by uid 99); 25 Nov 2008 18:18:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2008 10:18:14 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 25 Nov 2008 18:16:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B6B552388873; Tue, 25 Nov 2008 10:17:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720558 - in /apr/apr-util/trunk: include/private/apu_config.hnw ldap/apr_ldap_stub.c misc/apu_dso.c Date: Tue, 25 Nov 2008 18:17:12 -0000 To: commits@apr.apache.org From: bnicholes@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081125181712.B6B552388873@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bnicholes Date: Tue Nov 25 10:17:12 2008 New Revision: 720558 URL: http://svn.apache.org/viewvc?rev=720558&view=rev Log: Turn off the DSO build for netware and revert the previous changes that tried to make it work. Modified: apr/apr-util/trunk/include/private/apu_config.hnw apr/apr-util/trunk/ldap/apr_ldap_stub.c apr/apr-util/trunk/misc/apu_dso.c Modified: apr/apr-util/trunk/include/private/apu_config.hnw URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/private/apu_config.hnw?rev=720558&r1=720557&r2=720558&view=diff ============================================================================== --- apr/apr-util/trunk/include/private/apu_config.hnw (original) +++ apr/apr-util/trunk/include/private/apu_config.hnw Tue Nov 25 10:17:12 2008 @@ -25,7 +25,7 @@ #define APU_CONFIG_H /* Always compile Netware with DSO support for .nlm builds */ -#define APU_DSO_BUILD 1 +#define APU_DSO_BUILD 0 /* * NetWare does not have GDBM, and we always use the bundled (new) Expat Modified: apr/apr-util/trunk/ldap/apr_ldap_stub.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_stub.c?rev=720558&r1=720557&r2=720558&view=diff ============================================================================== --- apr/apr-util/trunk/ldap/apr_ldap_stub.c (original) +++ apr/apr-util/trunk/ldap/apr_ldap_stub.c Tue Nov 25 10:17:12 2008 @@ -45,9 +45,7 @@ return rv; } -#if defined(NETWARE) - modname = "aprlib.nlm"; -#elif defined(WIN32) +#if defined(WIN32) modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll"; #else modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so"; Modified: apr/apr-util/trunk/misc/apu_dso.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/misc/apu_dso.c?rev=720558&r1=720557&r2=720558&view=diff ============================================================================== --- apr/apr-util/trunk/misc/apu_dso.c (original) +++ apr/apr-util/trunk/misc/apu_dso.c Tue Nov 25 10:17:12 2008 @@ -82,11 +82,6 @@ /* Top level pool scope, need process-scope lifetime */ for (parent = global = pool; parent; parent = apr_pool_parent_get(global)) -#ifdef NETWARE - if (parent == global) { - break; - } -#endif global = parent; dsos = apr_hash_make(global);