diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-04-11 16:10:59 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-04-11 16:10:59 +0200 |
| commit | 4fd1d0eb42b958f725f8d81c9bebcc2ea20efdd8 (patch) | |
| tree | 1475d1860f32a7e033dc254e2560a1e996e33f84 /server/mpm/winnt | |
| parent | match expected type of arg to StartService() (diff) | |
| download | apache2-4fd1d0eb42b958f725f8d81c9bebcc2ea20efdd8.tar.xz apache2-4fd1d0eb42b958f725f8d81c9bebcc2ea20efdd8.zip | |
axe the cast in the call to our mpm_nt_eventlog_stderr_open()
by fixing the function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/winnt')
| -rw-r--r-- | server/mpm/winnt/mpm_winnt.c | 2 | ||||
| -rw-r--r-- | server/mpm/winnt/mpm_winnt.h | 2 | ||||
| -rw-r--r-- | server/mpm/winnt/nt_eventlog.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index d727d00a86..fc10a8e379 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1189,7 +1189,7 @@ static void winnt_rewrite_args(process_rec *process) * after logging begins, and the failure can land in the log. */ if (!errout) { - mpm_nt_eventlog_stderr_open((char*)service_name, process->pool); + mpm_nt_eventlog_stderr_open(service_name, process->pool); } service_to_start_success = mpm_service_to_start(&service_name, process->pool); diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h index 32637c11b6..c8ffc1dacc 100644 --- a/server/mpm/winnt/mpm_winnt.h +++ b/server/mpm/winnt/mpm_winnt.h @@ -62,7 +62,7 @@ void mpm_start_child_console_handler(void); /* From nt_eventlog.c: */ -void mpm_nt_eventlog_stderr_open(char *display_name, apr_pool_t *p); +void mpm_nt_eventlog_stderr_open(const char *display_name, apr_pool_t *p); void mpm_nt_eventlog_stderr_flush(void); /* From mpm_winnt.c: */ diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c index 337fd60ac4..54869949dc 100644 --- a/server/mpm/winnt/nt_eventlog.c +++ b/server/mpm/winnt/nt_eventlog.c @@ -22,7 +22,7 @@ #include "apr_portable.h" #include "ap_regkey.h" -static char *display_name = NULL; +static const char *display_name = NULL; static HANDLE stderr_thread = NULL; static HANDLE stderr_ready; @@ -129,7 +129,7 @@ void mpm_nt_eventlog_stderr_flush(void) } -void mpm_nt_eventlog_stderr_open(char *argv0, apr_pool_t *p) +void mpm_nt_eventlog_stderr_open(const char *argv0, apr_pool_t *p) { SECURITY_ATTRIBUTES sa; HANDLE hPipeRead = NULL; |