From 24beda9563a83c07b093a6b18488e8a938e3394d Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Wed, 31 May 2000 22:06:33 +0000 Subject: [PATCH] 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 --- include/httpd.h | 2 +- server/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/httpd.h b/include/httpd.h index 6b44d53450..165f713252 100644 --- 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 9993c4f79a..0ec8278f75 100644 --- 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; -- 2.40.0