apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r374468 - /apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
Date Thu, 02 Feb 2006 19:29:24 GMT
Author: rooneg
Date: Thu Feb  2 11:29:23 2006
New Revision: 374468

URL: http://svn.apache.org/viewcvs?rev=374468&view=rev
Log:
Merge r330141 into 1.2.x, it's needed to fix a build error on AIX.

Original log message:

PR#37325

Modified:
    apr/apr-util/branches/1.2.x/dbd/apr_dbd.c

Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/dbd/apr_dbd.c?rev=374468&r1=374467&r2=374468&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd.c Thu Feb  2 11:29:23 2006
@@ -27,6 +27,7 @@
 
 static apr_hash_t *drivers = NULL;
 
+#define CLEANUP_CAST (apr_status_t (*)(void*))
 
 /* Once the autofoo supports building it for dynamic load, we can use
  * #define APR_DSO_BUILD APR_HAS_DSO
@@ -56,7 +57,8 @@
 
 #if APR_HAS_THREADS
     ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
-    apr_pool_cleanup_register(pool, mutex, (void*)apr_thread_mutex_destroy,
+    apr_pool_cleanup_register(pool, mutex,
+                              CLEANUP_CAST apr_thread_mutex_destroy,
                               apr_pool_cleanup_null);
 #endif
 
@@ -161,7 +163,8 @@
 {
     int ret = driver->start_transaction(pool, handle, trans);
     if (*trans) {
-        apr_pool_cleanup_register(pool, *trans, (void*)driver->end_transaction,
+        apr_pool_cleanup_register(pool, *trans,
+                                  CLEANUP_CAST driver->end_transaction,
                                   apr_pool_cleanup_null);
     }
     return ret;
@@ -170,7 +173,7 @@
                                          apr_pool_t *pool,
                                          apr_dbd_transaction_t *trans)
 {
-    apr_pool_cleanup_kill(pool, trans, (void*)driver->end_transaction);
+    apr_pool_cleanup_kill(pool, trans, CLEANUP_CAST driver->end_transaction);
     return driver->end_transaction(trans);
 }
 



Mime
View raw message