Commit 39de6c78 authored by Yang Tse's avatar Yang Tse
Browse files

adjust inclusion of "nameser.h"

parent e5c44820

ares/adig.c

+22 −13
Original line number Diff line number Diff line
@@ -17,24 +17,33 @@ 


#include "setup.h"



#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#endif

#ifdef HAVE_SYS_SOCKET_H

#  include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_IN_H

#  include <netinet/in.h>

#endif

#ifdef HAVE_ARPA_INET_H

#  include <arpa/inet.h>

#endif

#ifdef HAVE_NETDB_H

#  include <netdb.h>

#endif

#ifdef HAVE_ARPA_NAMESER_H

#  include <arpa/nameser.h>

#else

#  include "nameser.h"

#endif

#ifdef HAVE_ARPA_NAMESER_COMPAT_H

#  include <arpa/nameser_compat.h>

#endif



#ifdef HAVE_SYS_TIME_H

#  include <sys/time.h>

#endif

#ifdef HAVE_UNISTD_H

#  include <unistd.h>

#endif

#include <netdb.h>

#endif

#ifdef HAVE_STRINGS_H

#  include <strings.h>

#endif

ares/ares_expand_name.c

+5 −7
Original line number Diff line number Diff line
@@ -17,19 +17,17 @@ 


#include "setup.h"



#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_NETINET_IN_H

#  include <netinet/in.h>

#endif

#ifdef HAVE_ARPA_NAMESER_H

#  include <arpa/nameser.h>

#else

#  include "nameser.h"

#endif

#ifdef HAVE_ARPA_NAMESER_COMPAT_H

#  include <arpa/nameser_compat.h>

#endif

#endif



#include <stdlib.h>

#include "ares.h"

ares/ares_expand_string.c

+4 −6
Original line number Diff line number Diff line
@@ -17,15 +17,13 @@ 


#include "setup.h"



#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_NETINET_IN_H

#  include <netinet/in.h>

#endif

#ifdef HAVE_ARPA_NAMESER_H

#  include <arpa/nameser.h>

#endif

#else

#  include "nameser.h"

#endif



#include <string.h>

ares/ares_gethostbyaddr.c

+8 −10
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
 */

#include "setup.h"



#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_SYS_SOCKET_H

#  include <sys/socket.h>

#endif
@@ -33,11 +30,12 @@ 
#endif

#ifdef HAVE_ARPA_NAMESER_H

#  include <arpa/nameser.h>

#else

#  include "nameser.h"

#endif

#ifdef HAVE_ARPA_NAMESER_COMPAT_H

#  include <arpa/nameser_compat.h>

#endif

#endif



#include <stdio.h>

#include <stdlib.h>

ares/ares_gethostbyname.c

+8 −13
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


#include "setup.h"



#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_SYS_SOCKET_H

#  include <sys/socket.h>

#endif
@@ -34,14 +31,12 @@ 
#endif

#ifdef HAVE_ARPA_NAMESER_H

#  include <arpa/nameser.h>

#endif

#ifdef HAVE_ARPA_NAMESER_H

#include <arpa/nameser.h>

#else

#  include "nameser.h"

#endif

#ifdef HAVE_ARPA_NAMESER_COMPAT_H

#  include <arpa/nameser_compat.h>

#endif

#endif



#include <stdio.h>

#include <stdlib.h>