move linkage var declarations to ares_getopt.h
This commit is contained in:
parent
69c5506b69
commit
827228bd69
@ -53,11 +53,6 @@
|
|||||||
#define T_SRV 33 /* server selection */
|
#define T_SRV 33 /* server selection */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef optind
|
|
||||||
extern int optind;
|
|
||||||
extern char *optarg;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct nv {
|
struct nv {
|
||||||
const char *name;
|
const char *name;
|
||||||
int value;
|
int value;
|
||||||
|
@ -40,11 +40,6 @@
|
|||||||
#include "inet_net_pton.h"
|
#include "inet_net_pton.h"
|
||||||
#include "ares_getopt.h"
|
#include "ares_getopt.h"
|
||||||
|
|
||||||
#ifndef optind
|
|
||||||
extern int optind;
|
|
||||||
extern char *optarg;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_STRUCT_IN6_ADDR
|
#ifndef HAVE_STRUCT_IN6_ADDR
|
||||||
struct in6_addr
|
struct in6_addr
|
||||||
{
|
{
|
||||||
|
@ -49,11 +49,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "ares_getopt.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 */
|
int opterr = 1, /* if error message should be printed */
|
||||||
optind = 1, /* index into parent argv vector */
|
optind = 1, /* index into parent argv vector */
|
||||||
optopt, /* character checked for validity */
|
optopt, /* character checked for validity */
|
||||||
|
@ -33,5 +33,9 @@
|
|||||||
|
|
||||||
int ares_getopt(int nargc, char * const nargv[], const char *ostr);
|
int ares_getopt(int nargc, char * const nargv[], const char *ostr);
|
||||||
|
|
||||||
|
extern char *optarg;
|
||||||
|
extern int optind;
|
||||||
|
extern int opterr;
|
||||||
|
|
||||||
|
|
||||||
#endif /* ARES_GETOPT_H */
|
#endif /* ARES_GETOPT_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user