From a82a8fbf821734dd5167ac2e83acfb4d6646e9fe Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 2 Nov 2009 11:55:53 +0000 Subject: [PATCH] Renamed c-ares setup.h to ares_setup.h --- CHANGES | 3 ++ Makefile.am | 2 +- Makefile.inc | 2 +- Makefile.vc6 | 68 ++++++++++++++++++++--------------------- acountry.c | 2 +- adig.c | 2 +- ahost.c | 2 +- ares__close_sockets.c | 2 +- ares__get_hostent.c | 2 +- ares__read_line.c | 2 +- ares__timeval.c | 2 +- ares_cancel.c | 2 +- ares_destroy.c | 2 +- ares_expand_name.c | 2 +- ares_expand_string.c | 2 +- ares_fds.c | 2 +- ares_free_hostent.c | 2 +- ares_free_string.c | 2 +- ares_gethostbyaddr.c | 2 +- ares_gethostbyname.c | 2 +- ares_getnameinfo.c | 2 +- ares_getsock.c | 2 +- ares_init.c | 2 +- ares_library_init.c | 2 +- ares_library_init.h | 2 +- ares_llist.c | 2 +- ares_mkquery.c | 2 +- ares_parse_a_reply.c | 2 +- ares_parse_aaaa_reply.c | 2 +- ares_parse_ns_reply.c | 2 +- ares_parse_ptr_reply.c | 2 +- ares_parse_srv_reply.c | 2 +- ares_parse_txt_reply.c | 2 +- ares_process.c | 2 +- ares_query.c | 2 +- ares_search.c | 2 +- ares_send.c | 2 +- setup.h => ares_setup.h | 6 ++-- ares_strcasecmp.c | 2 +- ares_strcasecmp.h | 2 +- ares_strdup.c | 2 +- ares_strdup.h | 2 +- ares_strerror.c | 2 +- ares_timeout.c | 2 +- ares_version.c | 2 +- ares_writev.c | 2 +- ares_writev.h | 2 +- bitncmp.c | 2 +- inet_net_pton.c | 2 +- inet_ntop.c | 2 +- windows_port.c | 2 +- 51 files changed, 88 insertions(+), 85 deletions(-) rename setup.h => ares_setup.h (98%) diff --git a/CHANGES b/CHANGES index 198beb8d..79878742 100644 --- a/CHANGES +++ b/CHANGES @@ -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. diff --git a/Makefile.am b/Makefile.am index 9a492584..e8b70204 100644 --- 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 \ diff --git a/Makefile.inc b/Makefile.inc index e383ebb8..04ab7a12 100644 --- 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 \ diff --git a/Makefile.vc6 b/Makefile.vc6 index b0af6131..4d68f371 100644 --- 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 diff --git a/acountry.c b/acountry.c index 92707f3a..e61613c5 100644 --- a/acountry.c +++ b/acountry.c @@ -33,7 +33,7 @@ * without express or implied warranty. */ -#include "setup.h" +#include "ares_setup.h" #include #include diff --git a/adig.c b/adig.c index 3a5c3da9..8488d97e 100644 --- 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 diff --git a/ahost.c b/ahost.c index 0e6797e1..4e293405 100644 --- 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 diff --git a/ares__close_sockets.c b/ares__close_sockets.c index 1becf9ab..d2476fdb 100644 --- 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 #ifdef HAVE_UNISTD_H diff --git a/ares__get_hostent.c b/ares__get_hostent.c index 9b1d4245..18d30098 100644 --- 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 diff --git a/ares__read_line.c b/ares__read_line.c index d198b12a..561b12e7 100644 --- 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 #include #include diff --git a/ares__timeval.c b/ares__timeval.c index 7437b5a1..8cf37e91 100644 --- 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" diff --git a/ares_cancel.c b/ares_cancel.c index 63b1514e..a730a651 100644 --- 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 #include #include "ares.h" diff --git a/ares_destroy.c b/ares_destroy.c index ef5cdb8b..2dfb6944 100644 --- 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 #include #include "ares.h" diff --git a/ares_expand_name.c b/ares_expand_name.c index a1556e93..5a48b4d5 100644 --- 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 diff --git a/ares_expand_string.c b/ares_expand_string.c index f2d4f748..6ab8a775 100644 --- 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 diff --git a/ares_fds.c b/ares_fds.c index 4c6299a4..bbf5c454 100644 --- 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 diff --git a/ares_free_hostent.c b/ares_free_hostent.c index d7667956..623e1e24 100644 --- 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 #if !defined(WIN32) || defined(WATT32) diff --git a/ares_free_string.c b/ares_free_string.c index c5810b23..dc27f5b3 100644 --- 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 #include "ares.h" #include "ares_private.h" diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c index 63abc85e..cafb15e1 100644 --- 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 diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c index d708dfb1..acf1a44d 100644 --- 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 diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c index 2c5cf0e0..ec0fac05 100644 --- 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) || \ diff --git a/ares_getsock.c b/ares_getsock.c index 38b8fefa..1c5e9ff2 100644 --- 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 diff --git a/ares_init.c b/ares_init.c index 9f90f9e2..f7973f14 100644 --- 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 diff --git a/ares_library_init.c b/ares_library_init.c index f7286ad1..a2486ac7 100644 --- 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" diff --git a/ares_library_init.h b/ares_library_init.h index 6c596ba0..d99a0bae 100644 --- 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 diff --git a/ares_llist.c b/ares_llist.c index 77cbd4d0..f261dc73 100644 --- 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" diff --git a/ares_mkquery.c b/ares_mkquery.c index 27ec1ee1..56571885 100644 --- 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 diff --git a/ares_parse_a_reply.c b/ares_parse_a_reply.c index c2d809f2..3d59c8aa 100644 --- 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 diff --git a/ares_parse_aaaa_reply.c b/ares_parse_aaaa_reply.c index dd1d33b3..58c6b8ab 100644 --- 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 diff --git a/ares_parse_ns_reply.c b/ares_parse_ns_reply.c index a7f4543c..25c63299 100644 --- 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 diff --git a/ares_parse_ptr_reply.c b/ares_parse_ptr_reply.c index b72f9952..9923a9da 100644 --- 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 diff --git a/ares_parse_srv_reply.c b/ares_parse_srv_reply.c index 9179d4d0..88333105 100644 --- 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 diff --git a/ares_parse_txt_reply.c b/ares_parse_txt_reply.c index 6a83b070..583b64f1 100644 --- 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 diff --git a/ares_process.c b/ares_process.c index 41d18113..0bc3985d 100644 --- 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 diff --git a/ares_query.c b/ares_query.c index 0d1f0368..2a717fb3 100644 --- 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 diff --git a/ares_search.c b/ares_search.c index 9ab48e0e..8673c289 100644 --- 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 #include diff --git a/ares_send.c b/ares_send.c index 54e48618..c2b00653 100644 --- 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 diff --git a/setup.h b/ares_setup.h similarity index 98% rename from setup.h rename to ares_setup.h index 6959fe7d..58964371 100644 --- a/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 */ diff --git a/ares_strcasecmp.c b/ares_strcasecmp.c index c3d1df9f..30d64b91 100644 --- 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 diff --git a/ares_strcasecmp.h b/ares_strcasecmp.h index 85b053a9..28164d74 100644 --- 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); diff --git a/ares_strdup.c b/ares_strdup.c index 31137a34..6742c6f6 100644 --- 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 diff --git a/ares_strdup.h b/ares_strdup.h index 33df619b..980da526 100644 --- 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); diff --git a/ares_strerror.c b/ares_strerror.c index 1265cee0..70af5b68 100644 --- 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 #include "ares.h" diff --git a/ares_timeout.c b/ares_timeout.c index 18ef6e8c..72ea0dc3 100644 --- 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 diff --git a/ares_version.c b/ares_version.c index 25f8e77c..0f7d0371 100644 --- 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) diff --git a/ares_writev.c b/ares_writev.c index 96cf543d..4c12942d 100644 --- 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 diff --git a/ares_writev.h b/ares_writev.h index f5850ef5..860b2943 100644 --- 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 diff --git a/bitncmp.c b/bitncmp.c index 30891861..2ec8dc58 100644 --- a/bitncmp.c +++ b/bitncmp.c @@ -19,7 +19,7 @@ #ifndef HAVE_BITNCMP -#include "setup.h" +#include "ares_setup.h" #include "bitncmp.h" /* diff --git a/inet_net_pton.c b/inet_net_pton.c index 84a1dc58..1e278a79 100644 --- 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 diff --git a/inet_ntop.c b/inet_ntop.c index 7f43b5c0..b3061774 100644 --- 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 diff --git a/windows_port.c b/windows_port.c index fd13b148..64096a5b 100644 --- a/windows_port.c +++ b/windows_port.c @@ -1,4 +1,4 @@ -#include "setup.h" +#include "ares_setup.h" /* $Id$ */