*) remove obsolete http_conf_globals.h

[apache] / modules / generators / mod_info.c

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index e69d6cd51264ab7120da85772ecca2b094c94e8b..a8af1bcbfa3f15706690f0e872824a51543ab50f 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -91,7 +91,10 @@
 #include "http_main.h"
 #include "http_protocol.h"
 #include "util_script.h"
-#include "http_conf_globals.h"
+
+#if APR_HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 typedef struct {
     const char *name;                 /* matching module name */
@@ -111,7 +114,7 @@ static void *create_info_config(apr_pool_t *p, server_rec *s)
 {
     info_svr_conf *conf = (info_svr_conf *) apr_pcalloc(p, sizeof(info_svr_conf));
 
-    conf->more_info = apr_make_array(p, 20, sizeof(info_entry));
+    conf->more_info = apr_array_make(p, 20, sizeof(info_entry));
     return conf;
 }
 
@@ -121,7 +124,7 @@ static void *merge_info_config(apr_pool_t *p, void *basev, void *overridesv)
     info_svr_conf *base = (info_svr_conf *) basev;
     info_svr_conf *overrides = (info_svr_conf *) overridesv;
 
-    new->more_info = apr_append_arrays(p, overrides->more_info, base->more_info);
+    new->more_info = apr_array_append(p, overrides->more_info, base->more_info);
     return new;
 }
 
@@ -449,7 +452,7 @@ static const char *add_module_info(cmd_parms *cmd, void *dummy,
     server_rec *s = cmd->server;
     info_svr_conf *conf = (info_svr_conf *) ap_get_module_config(s->module_config,
                                                               &info_module);
-    info_entry *new = apr_push_array(conf->more_info);
+    info_entry *new = apr_array_push(conf->more_info);
 
     new->name = name;
     new->info = info;
@@ -463,9 +466,9 @@ static const command_rec info_cmds[] =
     {NULL}
 };
 
-static void register_hooks(void)
+static void register_hooks(apr_pool_t *p)
 {
-    ap_hook_handler(display_info, NULL, NULL, AP_HOOK_MIDDLE);
+    ap_hook_handler(display_info, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 module AP_MODULE_DECLARE_DATA info_module =