From 827228bd69f8dd17824ae878d6211809b193eaff Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 16 Apr 2007 15:35:34 +0000
Subject: [PATCH] move linkage var declarations to ares_getopt.h
---
ares/adig.c | 5 -----
ares/ahost.c | 5 -----
ares/ares_getopt.c | 5 -----
ares/ares_getopt.h | 4 ++++
4 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/ares/adig.c b/ares/adig.c
index 3a5c63efd3..1eea3df690 100644
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -53,11 +53,6 @@
#define T_SRV 33 /* server selection */
#endif
-#ifndef optind
-extern int optind;
-extern char *optarg;
-#endif
-
struct nv {
const char *name;
int value;
diff --git a/ares/ahost.c b/ares/ahost.c
index dfb51a9316..e381c19324 100644
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -40,11 +40,6 @@
#include "inet_net_pton.h"
#include "ares_getopt.h"
-#ifndef optind
-extern int optind;
-extern char *optarg;
-#endif
-
#ifndef HAVE_STRUCT_IN6_ADDR
struct in6_addr
{
diff --git a/ares/ares_getopt.c b/ares/ares_getopt.c
index c3e81fc407..3b565a49a1 100644
--- a/ares/ares_getopt.c
+++ b/ares/ares_getopt.c
@@ -49,11 +49,6 @@
#include <string.h>
#include "ares_getopt.h"
-/* declarations to provide consistent linkage */
-extern char *optarg;
-extern int optind;
-extern int opterr;
-
int opterr = 1, /* if error message should be printed */
optind = 1, /* index into parent argv vector */
optopt, /* character checked for validity */
diff --git a/ares/ares_getopt.h b/ares/ares_getopt.h
index e15dc6bfce..3dafaf38f4 100644
--- a/ares/ares_getopt.h
+++ b/ares/ares_getopt.h
@@ -33,5 +33,9 @@
int ares_getopt(int nargc, char * const nargv[], const char *ostr);
+extern char *optarg;
+extern int optind;
+extern int opterr;
+
#endif /* ARES_GETOPT_H */
--
GitLab