more namespace cleanup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84961 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_config.h b/include/http_config.h
index ed7b8dbd07658fbc8b6996149e2ec9da852f1fc5..7be298079c24c0399529ae0b381d66532c33e47c 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -337,6 +337,7 @@ void ap_setup_prelinked_modules(process_rec *process);
 void ap_show_directives(void);
 void ap_show_modules(void);
 server_rec *ap_read_config(process_rec *process, ap_context_t *temp_pool, const char *config_name);
+void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
 void ap_post_config_hook(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s);
 void ap_child_init_hook(ap_context_t *pchild, server_rec *s);
 void ap_register_hooks(module *m);

diff --git a/server/config.c b/server/config.c
index efa9c76ded01a0be604adef5329d8f5fb4d82ae0..b515ecae3ae94ca2bb4fa3ceedb7bdc4e71b3864 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1332,7 +1332,7 @@ void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m)
                              (*m->create_dir_config)(p, NULL));
 }
 
-void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
+void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
 {
     module *m;
 

diff --git a/server/main.c b/server/main.c
index 45d5f5e815d4c2bba063a41936a496f89a293037..da5d06105612ca3e545a0d3739ea860805e33e89 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -365,7 +365,7 @@ API_EXPORT_NONSTD(int)        main(int argc, char *argv[])
        for example, to settle down. */
 
     ap_server_root = def_server_root;
-    run_pre_config(pconf, plog, ptemp);
+    ap_run_pre_config(pconf, plog, ptemp);
     server_conf = ap_read_config(process, ptemp, confname);
     if (configtestonly) {
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
@@ -384,7 +384,7 @@ API_EXPORT_NONSTD(int)        main(int argc, char *argv[])
        }
        ap_create_context(&ptemp, pconf);
        ap_server_root = def_server_root;
-       run_pre_config(pconf, plog, ptemp);
+       ap_run_pre_config(pconf, plog, ptemp);
        server_conf = ap_read_config(process, ptemp, confname);
        ap_clear_pool(plog);
        ap_run_open_logs(pconf, plog, ptemp, server_conf);

diff --git a/server/mpm/mpmt_pthread/scoreboard.c b/server/mpm/mpmt_pthread/scoreboard.c
index ff427ea08c74579a617b46cb468477919b1d5665..7056d985faeed5b5fc6707048b9594b230aed513 100644 (file)
--- a/server/mpm/mpmt_pthread/scoreboard.c
+++ b/server/mpm/mpmt_pthread/scoreboard.c
@@ -87,14 +87,14 @@ API_VAR_IMPORT char *ap_scoreboard_fname;
 
 static ap_shmem_t *scoreboard_shm = NULL;
 
-ap_status_t cleanup_shared_mem(void *d)
+static ap_status_t cleanup_shared_mem(void *d)
 {
     mm_free(scoreboard_shm, ap_scoreboard_image);
     ap_scoreboard_image = NULL;
     ap_shm_destroy(scoreboard_shm);
 }
 
-void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_context_t *p)
 {
     char buf[512];
     const char *fname;