martin 99/11/20 14:05:28
Modified: src/lib/apr/misc/beos misc.h
src/lib/apr/misc/os2 misc.h
src/lib/apr/misc/unix misc.h
src/lib/apr/misc/win32 misc.h
src/lib/apr/test testargs.c ab_apr.c
Added: src/lib/apr/include apr_getopt.h
Log:
Under Linux, I always got a
"libc.so.6: Warning: definition of 'optarg' overriding common
libapr(getopt.o): warning: common is here"
To make matters cleaner, I added an apr_getopt.h to go with the
various copies of getopt.c in the os subdirectories. In this header,
I renamed all getopt-API functions to "apr_<apiname>". This avoids
name clashes with system libraries.
Revision Changes Path
1.4 +1 -0 apache-2.0/src/lib/apr/misc/beos/misc.h
Index: misc.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h 1999/10/08 11:29:54 1.3
+++ misc.h 1999/11/20 22:05:07 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.3 +1 -0 apache-2.0/src/lib/apr/misc/os2/misc.h
Index: misc.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/os2/misc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.h 1999/08/27 16:25:50 1.2
+++ misc.h 1999/11/20 22:05:14 1.3
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
struct context_t {
struct ap_pool_t *pool;
1.4 +1 -0 apache-2.0/src/lib/apr/misc/unix/misc.h
Index: misc.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h 1999/09/14 13:37:23 1.3
+++ misc.h 1999/11/20 22:05:17 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.4 +1 -0 apache-2.0/src/lib/apr/misc/win32/misc.h
Index: misc.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h 1999/09/22 13:29:28 1.3
+++ misc.h 1999/11/20 22:05:19 1.4
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_file_io.h"
#include "apr_errno.h"
+#include "apr_getopt.h"
typedef struct datastruct {
void *data;
1.1 apache-2.0/src/lib/apr/include/apr_getopt.h
Index: apr_getopt.h
===================================================================
/* ====================================================================
* Copyright (c) 1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group.
* For more information on the Apache Group and the Apache HTTP server
* project, please see <http://www.apache.org/>.
*
*/
#ifndef APR_GETOPT_H
#define APR_GETOPT_H
/* Rename all interfaces to prevent a name clash with system libraries */
#define opterr apr_opterr
#define optind apr_optind
#define optopt apr_optopt
#define optreset apr_optreset
#define optarg apr_optarg
#define getopt apr_getopt
extern int
opterr, /* if error message should be printed */
optind, /* index into parent argv vector */
optopt, /* character checked for validity */
optreset; /* reset getopt */
extern char *
optarg; /* argument associated with option */
extern int
getopt(int _argc, char *const _argv[], const char *_opts);
#endif /* ! APR_GETOPT_H */
1.4 +1 -0 apache-2.0/src/lib/apr/test/testargs.c
Index: testargs.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testargs.c 1999/10/04 16:37:24 1.3
+++ testargs.c 1999/11/20 22:05:25 1.4
@@ -57,6 +57,7 @@
#include "apr_errno.h"
#include "apr_general.h"
#include "apr_lib.h"
+#include "apr_getopt.h"
#include <stdio.h>
#ifdef BEOS
#include <unistd.h>
1.11 +1 -0 apache-2.0/src/lib/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ab_apr.c 1999/10/24 05:59:16 1.10
+++ ab_apr.c 1999/11/20 22:05:25 1.11
@@ -106,6 +106,7 @@
#include "apr_network_io.h"
#include "apr_file_io.h"
#include "apr_time.h"
+#include "apr_getopt.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
