Renamed c-ares setup.h to ares_setup.h

15 years ago · a82a8fbf82
parent bfca740909
commit a82a8fbf82
51 changed files with 88 additions and 85 deletions
--- a/3
+++ b/3
@ -1,5 +1,8 @@
  Changelog for the c-ares project

+* November 2, 2009 (Yang Tse)
+- Renamed c-ares setup.h to ares_setup.h
+
 * October 31, 2009 (Yang Tse)
 - Symbol hiding configure options are named now --enable-symbol-hiding
  and --disable-symbol-hiding in an attempt to make them less ambiguous.
--- a/Makefile.am
+++ b/Makefile.am
@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4
 # $(top_builddir)/../lib is for libcurl's generated lib/curl_config.h file
 # $(top_srcdir)/../lib is for libcurl's lib/setup.h and other "private" files
 # $(top_builddir) is for c-ares's generated ares_config.h file
-# $(top_srcdir) is for c-ares's lib/setup.h and other "c-ares-private" files
+# $(top_srcdir) is for c-ares's ares_setup.h and other "c-ares-private" files

 if CURLDEBUG
 INCLUDES = -I$(top_builddir)/../include \
--- a/Makefile.inc
+++ b/Makefile.inc
@ -55,7 +55,7 @@ HHEADERS = ares.h			\
  inet_net_pton.h			\
  inet_ntop.h				\
  nameser.h				\
-  setup.h				\
+  ares_setup.h				\
  setup_once.h

 MANPAGES = ares_cancel.3		\
--- a/Makefile.vc6
+++ b/Makefile.vc6
@ -159,117 +159,117 @@ vclean realclean: clean
 #
 # Copyright "gcc -MM .."
 #
-$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
+$(OBJ_DIR)\ares_fds.obj: ares_fds.c ares_setup.h setup_once.h ares.h ares_private.h \
  ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\ares_process.obj: ares_process.c ares_setup.h setup_once.h nameser.h     \
  ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c ares_setup.h setup_once.h     \
  ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h setup_once.h nameser.h         \
+$(OBJ_DIR)\ares_query.obj: ares_query.c ares_setup.h setup_once.h nameser.h         \
  ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h setup_once.h \
+$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c ares_setup.h setup_once.h \
  ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c ares_setup.h setup_once.h       \
  ares.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h setup_once.h nameser.h       \
+$(OBJ_DIR)\ares_search.obj: ares_search.c ares_setup.h setup_once.h nameser.h       \
  ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c ares_setup.h setup_once.h     \
  ares.h ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c ares_setup.h setup_once.h   \
  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h     \
  ares_rules.h

-$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h setup_once.h nameser.h ares.h    \
+$(OBJ_DIR)\ares_send.obj: ares_send.c ares_setup.h setup_once.h nameser.h ares.h    \
  ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h setup_once.h ares.h  \
+$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c ares_setup.h setup_once.h ares.h  \
  ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c ares_setup.h setup_once.h   \
  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h        \
  ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c setup.h setup_once.h ares.h  \
+$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c ares_setup.h setup_once.h ares.h  \
  ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h setup_once.h ares.h      \
+$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c ares_setup.h setup_once.h ares.h      \
  ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \
+$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c ares_setup.h setup_once.h ares.h          \
  ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h setup_once.h nameser.h ares.h    \
+$(OBJ_DIR)\ares_init.obj: ares_init.c ares_setup.h setup_once.h nameser.h ares.h    \
  ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h         \
  ares_library_init.h

-$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c ares_setup.h setup_once.h ares.h        \
  ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares__timeval.obj: ares__timeval.c setup.h setup_once.h ares.h      \
+$(OBJ_DIR)\ares__timeval.obj: ares__timeval.c ares_setup.h setup_once.h ares.h      \
  ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c ares_setup.h setup_once.h ares.h        \
  ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c ares_setup.h setup_once.h nameser.h     \
  ares.h ares_dns.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_version.obj: ares_version.c ares_setup.h setup_once.h ares.h        \
  ares_version.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c ares_setup.h setup_once.h       \
  nameser.h ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c ares_setup.h setup_once.h   \
  nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h          \
  ares_rules.h

-$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\windows_port.obj: windows_port.c ares_setup.h setup_once.h nameser.h     \
  ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c ares_setup.h setup_once.h   \
  nameser.h ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h            \
+$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c ares_setup.h            \
  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \
  ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h          \
+$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c ares_setup.h          \
  setup_once.h nameser.h ares.h ares_dns.h inet_net_pton.h ares_private.h      \
  ares_ipv6.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c setup.h              \
+$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c ares_setup.h              \
  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \
  ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c ares_setup.h setup_once.h       \
  nameser.h ares.h ares_private.h ares_ipv6.h inet_ntop.h ares_build.h         \
  ares_rules.h

-$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h setup_once.h nameser.h   \
+$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c ares_setup.h setup_once.h nameser.h   \
  ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h

 $(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h ares_build.h ares_rules.h

-$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h setup_once.h nameser.h           \
+$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c ares_setup.h setup_once.h nameser.h           \
  ares_ipv6.h inet_ntop.h ares_build.h ares_rules.h

 $(OBJ_DIR)\ares_getopt.obj: ares_getopt.c ares_getopt.h ares_build.h           \
  ares_rules.h

-$(OBJ_DIR)\ares_library_init.obj: ares_library_init.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares_library_init.obj: ares_library_init.c ares_setup.h setup_once.h     \
  ares.h ares_private.h ares_library_init.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_llist.obj: ares_llist.c setup.h setup_once.h ares.h            \
+$(OBJ_DIR)\ares_llist.obj: ares_llist.c ares_setup.h setup_once.h ares.h            \
  ares_private.h ares_llist.h ares_build.h ares_rules.h

-$(OBJ_DIR)\ares_writev.obj: ares_writev.c setup.h setup_once.h ares.h          \
+$(OBJ_DIR)\ares_writev.obj: ares_writev.c ares_setup.h setup_once.h ares.h          \
  ares_writev.h ares_build.h ares_rules.h
--- a/acountry.c
+++ b/acountry.c
@ -33,7 +33,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #include <stdio.h>
 #include <stdlib.h>
--- a/adig.c
+++ b/adig.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ahost.c
+++ b/ahost.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #if !defined(WIN32) || defined(WATT32)
 #ifdef HAVE_SYS_TIME_H
--- a/ares__close_sockets.c
+++ b/ares__close_sockets.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
--- a/ares__get_hostent.c
+++ b/ares__get_hostent.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares__read_line.c
+++ b/ares__read_line.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/ares__timeval.c
+++ b/ares__timeval.c
@ -13,7 +13,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"
 #include "ares_private.h"

--- a/ares_cancel.c
+++ b/ares_cancel.c
@ -13,7 +13,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include <stdlib.h>
 #include "ares.h"
--- a/ares_destroy.c
+++ b/ares_destroy.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include <stdlib.h>
 #include "ares.h"
--- a/ares_expand_name.c
+++ b/ares_expand_name.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_expand_string.c
+++ b/ares_expand_string.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_fds.c
+++ b/ares_fds.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/ares_free_hostent.c
+++ b/ares_free_hostent.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <stdlib.h>

 #if !defined(WIN32) || defined(WATT32)
--- a/ares_free_string.c
+++ b/ares_free_string.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
--- a/ares_gethostbyaddr.c
+++ b/ares_gethostbyaddr.c
@ -14,7 +14,7 @@
 * this software for any purpose.  It is provided "as is"
 * without express or implied warranty.
 */
-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_gethostbyname.c
+++ b/ares_gethostbyname.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_getnameinfo.c
+++ b/ares_getnameinfo.c
@ -14,7 +14,7 @@
 * this software for any purpose.  It is provided "as is"
 * without express or implied warranty.
 */
-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_GETSERVBYPORT_R
 #  if !defined(GETSERVBYPORT_R_ARGS) || \
--- a/ares_getsock.c
+++ b/ares_getsock.c
@ -13,7 +13,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/ares_init.c
+++ b/ares_init.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #if defined(WIN32) && !defined(WATT32)
 #include <iphlpapi.h>
--- a/ares_library_init.c
+++ b/ares_library_init.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #include "ares.h"
 #include "ares_library_init.h"
--- a/ares_library_init.h
+++ b/ares_library_init.h
@ -19,7 +19,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef WIN32

--- a/ares_llist.c
+++ b/ares_llist.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #include "ares.h"
 #include "ares_private.h"
--- a/ares_mkquery.c
+++ b/ares_mkquery.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_a_reply.c
+++ b/ares_parse_a_reply.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_aaaa_reply.c
+++ b/ares_parse_aaaa_reply.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_ns_reply.c
+++ b/ares_parse_ns_reply.c
@ -20,7 +20,7 @@
 *      on behalf of AVIRA Gmbh - http://www.avira.com
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_ptr_reply.c
+++ b/ares_parse_ptr_reply.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_srv_reply.c
+++ b/ares_parse_srv_reply.c
@ -20,7 +20,7 @@
 *      on behalf of Red Hat - http://www.redhat.com
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_parse_txt_reply.c
+++ b/ares_parse_txt_reply.c
@ -17,7 +17,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_process.c
+++ b/ares_process.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_query.c
+++ b/ares_query.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_search.c
+++ b/ares_search.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #include <stdio.h>
 #include <stdlib.h>
--- a/ares_send.c
+++ b/ares_send.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/ares_setup.h
+++ b/ares_setup.h
@ -1,5 +1,5 @@
-#ifndef __ARES_SETUP_H
-#define __ARES_SETUP_H
+#ifndef HEADER_CARES_SETUP_H
+#define HEADER_CARES_SETUP_H

 /* $Id$ */

@ -184,4 +184,4 @@
 #include "setup_once.h"
 #endif

-#endif /* __ARES_SETUP_H */
+#endif /* HEADER_CARES_SETUP_H */
--- a/ares_strcasecmp.c
+++ b/ares_strcasecmp.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include "ares_strcasecmp.h"

 #ifndef HAVE_STRCASECMP
--- a/ares_strcasecmp.h
+++ b/ares_strcasecmp.h
@ -18,7 +18,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifndef HAVE_STRCASECMP
 extern int ares_strcasecmp(const char *a, const char *b);
--- a/ares_strdup.c
+++ b/ares_strdup.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include "ares_strdup.h"

 #ifndef HAVE_STRDUP
--- a/ares_strdup.h
+++ b/ares_strdup.h
@ -18,7 +18,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifndef HAVE_STRDUP
 extern char *ares_strdup(const char *s1);
--- a/ares_strerror.c
+++ b/ares_strerror.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include "ares.h"

--- a/ares_timeout.c
+++ b/ares_timeout.c
@ -15,7 +15,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/ares_version.c
+++ b/ares_version.c
@ -1,6 +1,6 @@
 /* $Id$ */

-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"

 const char *ares_version(int *version)
--- a/ares_writev.c
+++ b/ares_writev.c
@ -16,7 +16,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
--- a/ares_writev.h
+++ b/ares_writev.h
@ -18,7 +18,7 @@
 * without express or implied warranty.
 */

-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"

 #ifndef HAVE_WRITEV
--- a/bitncmp.c
+++ b/bitncmp.c
@ -19,7 +19,7 @@

 #ifndef HAVE_BITNCMP

-#include "setup.h"
+#include "ares_setup.h"
 #include "bitncmp.h"

 /*
--- a/inet_net_pton.c
+++ b/inet_net_pton.c
@ -17,7 +17,7 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/inet_ntop.c
+++ b/inet_ntop.c
@ -16,7 +16,7 @@
 * SOFTWARE.
 */

-#include "setup.h"
+#include "ares_setup.h"

 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
--- a/windows_port.c
+++ b/windows_port.c
@ -1,4 +1,4 @@
-#include "setup.h"
+#include "ares_setup.h"

 /* $Id$ */