[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r720558 - in /apr/apr-util/trunk: include/private/apu_config.hnw
From:       bnicholes () apache ! org
Date:       2008-11-25 18:17:12
Message-ID: 20081125181712.B6B552388873 () eris ! apache ! org
[Download RAW message or body]

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);


[prev in list] [next in list] [prev in thread] [next in thread]