apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r555121 - in /apr/apr-util/branches/1.2.x: dbd/apr_dbd.c include/apu.h.in include/apu.hnw include/apu.hw
Date Wed, 11 Jul 2007 00:05:38 GMT
Author: fuankg
Date: Tue Jul 10 17:05:37 2007
New Revision: 555121

URL: http://svn.apache.org/viewvc?view=rev&rev=555121
Log:
reverted r553030;
changed to use apr_snprintf() for the driver loads.

Modified:
    apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
    apr/apr-util/branches/1.2.x/include/apu.h.in
    apr/apr-util/branches/1.2.x/include/apu.hnw
    apr/apr-util/branches/1.2.x/include/apu.hw

Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbd/apr_dbd.c?view=diff&rev=555121&r1=555120&r2=555121
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd.c Tue Jul 10 17:05:37 2007
@@ -124,8 +124,13 @@
     }
 #endif
 
-    /* APU_DBD_DRIVER_FMT is defined in apu.h */
-    apr_snprintf(path, sizeof path, APU_DBD_DRIVER_FMT, name);
+#ifdef WIN32
+    apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
+#elif defined(NETWARE)
+    apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
+#else
+    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
+#endif
     rv = apr_dso_load(&dlhandle, path, pool);
     if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
         goto unlock;

Modified: apr/apr-util/branches/1.2.x/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apu.h.in?view=diff&rev=555121&r1=555120&r2=555121
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apu.h.in (original)
+++ apr/apr-util/branches/1.2.x/include/apu.h.in Tue Jul 10 17:05:37 2007
@@ -87,7 +87,5 @@
 #define APU_HAVE_ICONV         @have_iconv@
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
-#define APU_DBD_DRIVER_FMT "apr_dbd_%s.so"
-
 #endif /* APU_H */
 /** @} */

Modified: apr/apr-util/branches/1.2.x/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apu.hnw?view=diff&rev=555121&r1=555120&r2=555121
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apu.hnw (original)
+++ apr/apr-util/branches/1.2.x/include/apu.hnw Tue Jul 10 17:05:37 2007
@@ -85,7 +85,5 @@
  */
 #define APR_DSO_BUILD APR_HAS_DSO
 
-#define APU_DBD_DRIVER_FMT "dbd%s.nlm"
-
 #endif /* APU_H */
 /** @} */

Modified: apr/apr-util/branches/1.2.x/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apu.hw?view=diff&rev=555121&r1=555120&r2=555121
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apu.hw (original)
+++ apr/apr-util/branches/1.2.x/include/apu.hw Tue Jul 10 17:05:37 2007
@@ -109,7 +109,5 @@
 #define APU_HAVE_SQLITE3    0
 #endif
 
-#define APU_DBD_DRIVER_FMT "apr_dbd_%s.dll"
-
 #endif /* APU_H */
 #endif /* WIN32 */



Mime
View raw message