summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormartin <martin@13f79535-47bb-0310-9956-ffa450edef68>1999-11-20 22:05:25 +0000
committermartin <martin@13f79535-47bb-0310-9956-ffa450edef68>1999-11-20 22:05:25 +0000
commit37132bf351406cc8f32b69d79413c9f5786babd9 (patch)
treede86de6b9b73f857cd79f52f2a178dc96cb34bf4 /misc
parent4069ca1d67f51545f522b5516259ba30093cc01e (diff)
downloadlibapr-37132bf351406cc8f32b69d79413c9f5786babd9.tar.gz
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. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59481 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
-rw-r--r--misc/beos/misc.h1
-rw-r--r--misc/os2/misc.h1
-rw-r--r--misc/unix/misc.h1
-rw-r--r--misc/win32/misc.h1
4 files changed, 4 insertions, 0 deletions
diff --git a/misc/beos/misc.h b/misc/beos/misc.h
index f0aa0d912..305c7d291 100644
--- a/misc/beos/misc.h
+++ b/misc/beos/misc.h
@@ -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;
diff --git a/misc/os2/misc.h b/misc/os2/misc.h
index 713409b4b..15b5fa38f 100644
--- a/misc/os2/misc.h
+++ b/misc/os2/misc.h
@@ -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;
diff --git a/misc/unix/misc.h b/misc/unix/misc.h
index 88387f6bb..ea8cb12fd 100644
--- a/misc/unix/misc.h
+++ b/misc/unix/misc.h
@@ -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;
diff --git a/misc/win32/misc.h b/misc/win32/misc.h
index 7d5a09d32..7cca295cd 100644
--- a/misc/win32/misc.h
+++ b/misc/win32/misc.h
@@ -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;