This was a complete mess; the correct answer is that the entire file

is meaningless without APU_DSO_BUILD, all functions are internal.

The correct "fix" to missing APR_HAS_DSO is to toggle off APU_DSO_BUILD
within ./configure.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719451 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 15 deletions

diff --git a/misc/apu_dso.c b/misc/apu_dso.c
index 829878a3..83e24569 100644
--- a/misc/apu_dso.c
+++ b/misc/apu_dso.c
@@ -31,14 +31,14 @@
 #include "apu_internal.h"
 #include "apu_version.h"
 
+#if APU_DSO_BUILD
 
 #if APR_HAS_THREADS
 static apr_thread_mutex_t* mutex = NULL;
 #endif
 static apr_hash_t *dsos = NULL;
 
-
-#if APR_HAS_THREADS && APU_DSO_BUILD
+#if APR_HAS_THREADS
 apr_status_t apu_dso_mutex_lock()
 {
     return apr_thread_mutex_lock(mutex);
@@ -56,9 +56,6 @@ apr_status_t apu_dso_mutex_unlock() {
 }
 #endif
 
-#define CLEANUP_CAST (apr_status_t (*)(void*))
-
-
 static apr_status_t apu_dso_term(void *ptr)
 {
     /* set statics to NULL so init can work again */
@@ -76,7 +73,6 @@ static apr_status_t apu_dso_term(void *ptr)
 apr_status_t apu_dso_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
-#if APU_DSO_BUILD
     apr_pool_t *global;
     apr_pool_t *parent;
 
@@ -98,17 +94,15 @@ apr_status_t apu_dso_init(apr_pool_t *pool)
     apr_pool_cleanup_register(global, NULL, apu_dso_term,
                               apr_pool_cleanup_null);
 
-#endif /* APU_DSO_BUILD */
     return ret;
 }
 
-#if APR_HAS_DSO
-apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr, apr_dso_handle_sym_t *dsoptr, const char *module,
-                          const char *modsym, apr_pool_t *pool)
+apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr,
+                          apr_dso_handle_sym_t *dsoptr,
+                          const char *module,
+                          const char *modsym,
+                          apr_pool_t *pool)
 {
-#if !APU_DSO_BUILD
-    return APR_ENOTIMPL;
-#else
     apr_dso_handle_t *dlhandle = NULL;
     char *pathlist;
     char path[APR_PATH_MAX + 1];
@@ -199,7 +193,7 @@ apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr, apr_dso_handle_sym_t *
         apr_hash_set(dsos, module, APR_HASH_KEY_STRING, *dsoptr);
     }
     return rv;
-#endif /* APU_DSO_BUILD */
 }
-#endif /* APR_HAS_DSO */
+
+#endif /* APU_DSO_BUILD */