svn commit: r661528 - in /apr/apr-util/trunk: include/private/apu_config.hw misc/apu_dso.c

[wr...@apache.org]

Author: wrowe
Date: Thu May 29 16:31:50 2008
New Revision: 661528

URL: http://svn.apache.org/viewvc?rev=661528&view=rev
Log:
Remaining changes to plug win32 into the dso schema.

Modified:
    apr/apr-util/trunk/include/private/apu_config.hw
    apr/apr-util/trunk/misc/apu_dso.c

Modified: apr/apr-util/trunk/include/private/apu_config.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/private/apu_config.hw?rev=661528&r1=661527&r2=661528&view=diff
==============================================================================
--- apr/apr-util/trunk/include/private/apu_config.hw (original)
+++ apr/apr-util/trunk/include/private/apu_config.hw Thu May 29 16:31:50 2008
@@ -24,8 +24,12 @@
 #ifndef APU_CONFIG_H
 #define APU_CONFIG_H
 
-/* Always compile win32 with DSO support */
+/* Compile win32 with DSO support for .dll builds */
+#ifdef APU_DECLARE_STATIC
+#define APU_DSO_BUILD           0
+#else
 #define APU_DSO_BUILD           1
+#endif
 
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat

Modified: apr/apr-util/trunk/misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/misc/apu_dso.c?rev=661528&r1=661527&r2=661528&view=diff
==============================================================================
--- apr/apr-util/trunk/misc/apu_dso.c (original)
+++ apr/apr-util/trunk/misc/apu_dso.c Thu May 29 16:31:50 2008
@@ -76,10 +76,10 @@
 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;
 
-#if APU_DSO_BUILD
     if (dsos != NULL) {
         return APR_SUCCESS;
     }
@@ -131,8 +131,12 @@
           || (apr_filepath_list_split(&paths, pathlist, pool) != APR_SUCCESS))
         paths = apr_array_make(pool, 1, sizeof(char*));
 
-    /* Always search our prefix path */
+#if defined(APU_DSO_LIBDIR)
+    /* Always search our prefix path, but on some platforms such as
+     * win32 this may be left undefined
+     */
     (*((char **)apr_array_push(paths))) = APU_DSO_LIBDIR;
+#endif
 
     for (i = 0; i < paths->nelts; ++i)
     {