Remove a warning when compiled with --use-maintainer-mode. Basically,

process_rec should just be storing argv the same way that getopt
expects it.

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

diff --git a/include/httpd.h b/include/httpd.h
index 6b44d534508d2cffc557ca581e3c7d2e5d6cc37d..165f71325260527408232d12e70db24ed5d92bb3 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -602,7 +602,7 @@ struct process_rec {
     ap_pool_t *pool;  /* Global pool. Please try to cleared on _all_ exits */
     ap_pool_t *pconf; /* aka configuration pool, cleared on restarts */
     int argc;
-    const char **argv;
+    char *const *argv;
     const char *short_name;
 };
 

diff --git a/server/main.c b/server/main.c
index 9993c4f79a2d1135e51c244824243a04e9a814c7..0ec8278f75fa961638d4a3d4df6680148cf08e8b 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -200,7 +200,7 @@ static void destroy_and_exit_process(process_rec *process, int process_exit_valu
     exit(process_exit_value);
 }
 
-static process_rec *create_process(int argc, const char **argv)
+static process_rec *create_process(int argc, char *const *argv)
 {
     process_rec *process;
     
@@ -300,7 +300,7 @@ API_EXPORT(int)        main(int argc, char *argv[])
 #ifndef WIN32 /* done in main_win32.c */
     ap_initialize();
 #endif
-    process = create_process(argc, (const char **)argv);
+    process = create_process(argc, (char *const *)argv);
     pglobal = process->pool;
     pconf = process->pconf;
     ap_server_argv0 = process->short_name;