6 files changed, 12 insertions, 12 deletions
diff --git a/dso/aix/dso.c b/dso/aix/dso.c
index 1926180bb..4863107df 100644
--- a/dso/aix/dso.c
+++ b/dso/aix/dso.c
@@ -155,14 +155,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     (*res_handle)->handle = (void*)os_handle;
     (*res_handle)->cont = ctx;
 
-    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->cont, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
 }
 
 APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
diff --git a/dso/beos/dso.c b/dso/beos/dso.c
index 6fdc4cd75..b41d97b75 100644
--- a/dso/beos/dso.c
+++ b/dso/beos/dso.c
@@ -79,14 +79,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char
     (*res_handle)->handle = newid;
     (*res_handle)->cont = ctx;
 
-    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->cont, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
 }
 
 APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t *handle,
diff --git a/dso/os2/dso.c b/dso/os2/dso.c
index bceef2e06..50ed0d282 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -94,7 +94,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char
     }
 
     (*res_handle)->handle  = handle;
-    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -102,7 +102,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->cont, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
 }
 
 
diff --git a/dso/os390/dso.c b/dso/os390/dso.c
index 631d941bf..24d42844b 100644
--- a/dso/os390/dso.c
+++ b/dso/os390/dso.c
@@ -87,7 +87,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
 
     if ((handle = dllload(path)) != NULL) {
         (*res_handle)->handle  = handle;
-        apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+        apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
         return APR_SUCCESS;
     }
 
@@ -97,7 +97,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->pool, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
 }
 
 APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
diff --git a/dso/unix/dso.c b/dso/unix/dso.c
index 25871f7ed..9ee57d939 100644
--- a/dso/unix/dso.c
+++ b/dso/unix/dso.c
@@ -107,14 +107,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     (*res_handle)->cont = ctx;
     (*res_handle)->errormsg = NULL;
 
-    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
     
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->cont, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
 }
 
 APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
diff --git a/dso/win32/dso.c b/dso/win32/dso.c
index 068f7b7d3..b77f0bfa4 100644
--- a/dso/win32/dso.c
+++ b/dso/win32/dso.c
@@ -126,14 +126,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle,
     (*res_handle)->cont = ctx;
     (*res_handle)->load_error = APR_SUCCESS;
 
-    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
     
 APR_DECLARE(apr_status_t) apr_dso_unload(struct apr_dso_handle_t *handle)
 {
-    return apr_run_cleanup(handle->cont, handle, dso_cleanup);
+    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
 }
 
 APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,