Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@57796 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/hooks/ap_hooks.c b/hooks/ap_hooks.c
index 6318365..b1d572a 100644
--- a/hooks/ap_hooks.c
+++ b/hooks/ap_hooks.c
@@ -34,7 +34,7 @@
return a->nOrder-b->nOrder;
}
-static TSort *prepare(ap_context_t *p,TSortData *pItems,int nItems)
+static TSort *prepare(ap_pool_t *p,TSortData *pItems,int nItems)
{
TSort *pData=ap_palloc(p,nItems*sizeof *pData);
int n;
@@ -115,12 +115,12 @@
static ap_array_header_t *sort_hook(ap_array_header_t *pHooks,const char *szName)
{
- ap_context_t *p;
+ ap_pool_t *p;
TSort *pSort;
ap_array_header_t *pNew;
int n;
- ap_create_context(&p, g_pHookPool);
+ ap_create_pool(&p, g_pHookPool);
pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
pSort=tsort(pSort,pHooks->nelts);
pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData));
diff --git a/hooks/apr_hooks.c b/hooks/apr_hooks.c
index 6318365..b1d572a 100644
--- a/hooks/apr_hooks.c
+++ b/hooks/apr_hooks.c
@@ -34,7 +34,7 @@
return a->nOrder-b->nOrder;
}
-static TSort *prepare(ap_context_t *p,TSortData *pItems,int nItems)
+static TSort *prepare(ap_pool_t *p,TSortData *pItems,int nItems)
{
TSort *pData=ap_palloc(p,nItems*sizeof *pData);
int n;
@@ -115,12 +115,12 @@
static ap_array_header_t *sort_hook(ap_array_header_t *pHooks,const char *szName)
{
- ap_context_t *p;
+ ap_pool_t *p;
TSort *pSort;
ap_array_header_t *pNew;
int n;
- ap_create_context(&p, g_pHookPool);
+ ap_create_pool(&p, g_pHookPool);
pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
pSort=tsort(pSort,pHooks->nelts);
pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData));
diff --git a/include/ap_hooks.h b/include/ap_hooks.h
index 6e7abd3..8b53955 100644
--- a/include/ap_hooks.h
+++ b/include/ap_hooks.h
@@ -115,7 +115,7 @@
#define HOOK_LAST 20
#define HOOK_REALLY_LAST 30
-extern ap_context_t *g_pHookPool;
+extern ap_pool_t *g_pHookPool;
extern int g_bDebugHooks;
extern const char *g_szCurrentHookName;
diff --git a/include/apr_hooks.h b/include/apr_hooks.h
index 6e7abd3..8b53955 100644
--- a/include/apr_hooks.h
+++ b/include/apr_hooks.h
@@ -115,7 +115,7 @@
#define HOOK_LAST 20
#define HOOK_REALLY_LAST 30
-extern ap_context_t *g_pHookPool;
+extern ap_pool_t *g_pHookPool;
extern int g_bDebugHooks;
extern const char *g_szCurrentHookName;
diff --git a/src/hooks/ap_hooks.c b/src/hooks/ap_hooks.c
index 6318365..b1d572a 100644
--- a/src/hooks/ap_hooks.c
+++ b/src/hooks/ap_hooks.c
@@ -34,7 +34,7 @@
return a->nOrder-b->nOrder;
}
-static TSort *prepare(ap_context_t *p,TSortData *pItems,int nItems)
+static TSort *prepare(ap_pool_t *p,TSortData *pItems,int nItems)
{
TSort *pData=ap_palloc(p,nItems*sizeof *pData);
int n;
@@ -115,12 +115,12 @@
static ap_array_header_t *sort_hook(ap_array_header_t *pHooks,const char *szName)
{
- ap_context_t *p;
+ ap_pool_t *p;
TSort *pSort;
ap_array_header_t *pNew;
int n;
- ap_create_context(&p, g_pHookPool);
+ ap_create_pool(&p, g_pHookPool);
pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
pSort=tsort(pSort,pHooks->nelts);
pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData));
