Commit 827228bd authored by Yang Tse's avatar Yang Tse
Browse files

move linkage var declarations to ares_getopt.h

parent 69c5506b

ares/adig.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

ares/ahost.c

+0 −5
Original line number Diff line number Diff line
@@ -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

{

ares/ares_getopt.c

+0 −5
Original line number Diff line number Diff line
@@ -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 */

ares/ares_getopt.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */