diff options
author | stoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-14 16:50:26 +0000 |
---|---|---|
committer | stoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-14 16:50:26 +0000 |
commit | 17e56b7db0622d16225fae9915f5d6217392b4ab (patch) | |
tree | 8b15a96be50053fecbfe64a03b294db6ea9acb68 /misc/win32/start.c | |
parent | 00a9ca6dfcb4118e8b5fd850a29512b6350a64e0 (diff) | |
download | libapr-17e56b7db0622d16225fae9915f5d6217392b4ab.tar.gz |
Get Windows compiling after the ap_context_t --> ap_pool_t change
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc/win32/start.c')
-rw-r--r-- | misc/win32/start.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/misc/win32/start.c b/misc/win32/start.c index eb281e9df..651b133c5 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -75,22 +75,18 @@ ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont) WSADATA wsaData; int err; ap_pool_t *new; - ap_pool_t *pool; if (cont) { - pool = ap_make_sub_pool(cont->pool, cont->apr_abort); + new = ap_make_sub_pool(cont, cont->apr_abort); } else { - pool = ap_make_sub_pool(NULL, NULL); + new = ap_make_sub_pool(NULL, NULL); } - if (pool == NULL) { + if (new == NULL) { return APR_ENOPOOL; } - new = (ap_pool_t *)ap_palloc(cont, sizeof(ap_pool_t)); - - new->pool = pool; new->prog_data = NULL; new->apr_abort = NULL; @@ -105,8 +101,6 @@ ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont) return APR_EEXIST; } - ap_register_cleanup(new, NULL, clean_cont, ap_null_cleanup); - *newcont = new; return APR_SUCCESS; } |