From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 4 Oct 2010 16:29:43 +0000 (+0000)
Subject: Removed duplicate global; removed obsolete cast.
X-Git-Tag: 2.3.9~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a463689100222010d37b0fd3a87f6ad52e123e9;p=thirdparty%2Fapache%2Fhttpd.git

Removed duplicate global; removed obsolete cast.


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

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 7a35f3fd330..c39552d7941 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -110,10 +110,6 @@ int nlmUnloadSignaled(int wait);
 
 #define MPM_HARD_LIMITS_FILE "/mpm_default.h"
 
-/* config globals */
-
-server_rec *ap_server_conf;
-
 /* *Non*-shared http_main globals... */
 
 static int ap_threads_per_child=0;         /* Worker threads per child */
@@ -1145,7 +1141,7 @@ static void netware_rewrite_args(process_rec *process)
 
             optbuf[0] = '-';
             optbuf[2] = '\0';
-            apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv);
+            apr_getopt_init(&opt, process->pool, process->argc, process->argv);
             while (apr_getopt(opt, AP_SERVER_BASEARGS"n:", optbuf + 1, &opt_arg) == APR_SUCCESS) {
                 switch (optbuf[1]) {
                 case 'n':