This is the patch described in the prior cvs checkin

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

1 files changed, 3 insertions, 7 deletions

diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 327ff7456..fc8b75f01 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -717,9 +717,8 @@ APR_DECLARE(void) apr_pool_cleanup_register(apr_pool_t *p, const void *data,
     }
 }
 
-APR_DECLARE(void) apr_pool_child_cleanup_set(apr_pool_t *p, const void *data,
-                                   apr_status_t (*plain_cleanup) (void *))
-                                   apr_status_t (*plain_cleanup) (void *))
+APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
+					apr_status_t (*cleanup) (void *))
 {
     struct cleanup *c;
     struct cleanup **lastp;
@@ -744,19 +743,16 @@ APR_DECLARE(void) apr_pool_child_cleanup_set(apr_pool_t *p, const void *data,
                                        apr_status_t (*child_cleanup) (void *))
 {
     struct cleanup *c;
-    struct cleanup **lastp;
 
     if (p == NULL)
         return;
     c = p->cleanups;
-    lastp = &p->cleanups;
     while (c) {
         if (c->data == data && c->plain_cleanup == plain_cleanup) {
-            c->child_cleanup = child_cleanup;
+            c->child_cleanup == child_cleanup;
             break;
         }
 
-        lastp = &c->next;
         c = c->next;
     }
 }