diff options
| author | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-25 18:17:12 +0000 |
|---|---|---|
| committer | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-25 18:17:12 +0000 |
| commit | 723fe62b1dd3731ae6cb2857256bffc1eaabc1c9 (patch) | |
| tree | 17cec5213b52acbaf40c2cea05653211f873b5ac | |
| parent | cfcee015cb12a1f96e2bab79b7ea185aaba72535 (diff) | |
| download | libapr-util-723fe62b1dd3731ae6cb2857256bffc1eaabc1c9.tar.gz | |
Turn off the DSO build for netware and revert the previous changes that tried to make it work.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@720558 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/private/apu_config.hnw | 2 | ||||
| -rw-r--r-- | ldap/apr_ldap_stub.c | 4 | ||||
| -rw-r--r-- | misc/apu_dso.c | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/include/private/apu_config.hnw b/include/private/apu_config.hnw index 9faf4042..9c6c73e4 100644 --- a/include/private/apu_config.hnw +++ b/include/private/apu_config.hnw @@ -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 diff --git a/ldap/apr_ldap_stub.c b/ldap/apr_ldap_stub.c index 149b2361..97c15514 100644 --- a/ldap/apr_ldap_stub.c +++ b/ldap/apr_ldap_stub.c @@ -45,9 +45,7 @@ static apr_status_t load_ldap(apr_pool_t *pool) 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"; diff --git a/misc/apu_dso.c b/misc/apu_dso.c index 9ea98175..383c5157 100644 --- a/misc/apu_dso.c +++ b/misc/apu_dso.c @@ -82,11 +82,6 @@ apr_status_t apu_dso_init(apr_pool_t *pool) /* 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); |