Fix name space pollution.

diff --git a/ares/ares_getopt.c b/ares/ares_getopt.c
index 59f3b8834d7ef460f1b6f37de9507ac796ce55aa..b3cbb012d1d7e72f6b5a0612f4e337fde3cb39f1 100644 (file)
--- a/ares/ares_getopt.c
+++ b/ares/ares_getopt.c
@@ -51,7 +51,7 @@
 
 int   opterr = 1,     /* if error message should be printed */
       optind = 1;     /* index into parent argv vector */
-static int optopt;    /* character checked for validity */
+int   optopt = 0;     /* character checked for validity */
 static int optreset;  /* reset getopt */
 char  *optarg;        /* argument associated with option */
 

diff --git a/ares/ares_getopt.h b/ares/ares_getopt.h
index e0eb283232b4c251fc8f5853d196bd671ba8a2b5..3c8074930ae7d741ef263d072962f88e8b4987e7 100644 (file)
--- a/ares/ares_getopt.h
+++ b/ares/ares_getopt.h
@@ -33,15 +33,15 @@
 
 int ares_getopt(int nargc, char * const nargv[], const char *ostr);
 
-#if defined(WATT32)
-#undef optarg
-#undef optind
-#undef opterr
-#endif
+#define optarg   ares_optarg
+#define optind   ares_optind
+#define opterr   ares_opterr
+#define optopt   ares_optopt
+#define optreset ares_optreset
 
 extern char *optarg;
 extern int optind;
 extern int opterr;
-
+extern int optopt;
 
 #endif /* ARES_GETOPT_H */