Return-Path: Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 31682 invoked by uid 500); 19 Nov 2001 12:45:33 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 31671 invoked from network); 19 Nov 2001 12:45:32 -0000 Message-ID: <3BF8FEEC.8060502@feld.cvut.cz> Date: Mon, 19 Nov 2001 13:45:32 +0100 From: Pavel Novy User-Agent: Mozilla/5.0 (Windows; U; Win98; en-US; rv:0.9.5+) Gecko/20011107 X-Accept-Language: cs, en MIME-Version: 1.0 To: dev@httpd.apache.org Subject: [PATCH] http-2.0/server/mpm/netware/mpm_netware.c Content-Type: multipart/mixed; boundary="------------020400030905020901070202" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------020400030905020901070202 Content-Type: text/plain; charset=ISO-8859-2; format=flowed Content-Transfer-Encoding: 7bit Hi, an optarg variable used here is conflicting with symbol name defined in the latest LIBC headers: ../../server/mpm/netware/mpm_netware.c: In function `netware_rewrite_args': ../../server/mpm/netware/mpm_netware.c:907: conflicting types for `___optarg' u:/ndk/libc/include/unistd.h:105: previous declaration of `___optarg' ../../server/mpm/netware/mpm_netware.c:907: warning: extern declaration of `___optarg' doesn't match global one make[1]: *** [../../server/mpm/netware/mpm_netware.o] Error 1 .../libc/include/unistd.h: ... /* globals for getopt() implementation... */ char **___optarg( void ); int *___optind( void ); int *___opterr( void ); int *___optopt( void ); #define optarg *___optarg() #define optind *___optind() #define opterr *___opterr() #define optopt *___optopt() ... Corresponding patch attached. Thanks, Pavel --------------020400030905020901070202 Content-Type: text/plain; name="mpm_netware.c.patch" Content-Disposition: inline; filename="mpm_netware.c.patch" Content-Transfer-Encoding: 7bit --- mpm_netware.c.orig Fri Nov 16 00:12:14 2001 +++ mpm_netware.c Mon Nov 19 13:16:50 2001 @@ -904,7 +904,7 @@ { char *def_server_root; char optbuf[3]; - const char *optarg; + const char *opt_arg; apr_getopt_t *opt; apr_array_header_t *mpm_new_argv; @@ -946,14 +946,14 @@ optbuf[0] = '-'; optbuf[2] = '\0'; apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv); - while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &optarg) == APR_SUCCESS) { + while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &opt_arg) == APR_SUCCESS) { switch (optbuf[1]) { default: *(const char **)apr_array_push(mpm_new_argv) = apr_pstrdup(process->pool, optbuf); - if (optarg) { - *(const char **)apr_array_push(mpm_new_argv) = optarg; + if (opt_arg) { + *(const char **)apr_array_push(mpm_new_argv) = opt_arg; } break; } --------------020400030905020901070202--