Commit 108b414b authored by Yang Tse's avatar Yang Tse
Browse files

Renamed c-ares setup.h to ares_setup.h

parent be7af8be

ares/CHANGES

+3 −0
Original line number Original line Diff line number Diff line 
  Changelog for the c-ares project

  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)

* October 31, 2009 (Yang Tse)

- Symbol hiding configure options are named now --enable-symbol-hiding

- Symbol hiding configure options are named now --enable-symbol-hiding

  and --disable-symbol-hiding in an attempt to make them less ambiguous.

  and --disable-symbol-hiding in an attempt to make them less ambiguous.

ares/Makefile.am

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4 
# $(top_builddir)/../lib is for libcurl's generated lib/curl_config.h file

# $(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_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_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

if CURLDEBUG

INCLUDES = -I$(top_builddir)/../include \

INCLUDES = -I$(top_builddir)/../include \

ares/Makefile.inc

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ HHEADERS = ares.h \ 
  inet_net_pton.h			\

  inet_net_pton.h			\

  inet_ntop.h				\

  inet_ntop.h				\

  nameser.h				\

  nameser.h				\

  setup.h				\

  ares_setup.h				\

  setup_once.h

  setup_once.h





MANPAGES = ares_cancel.3		\

MANPAGES = ares_cancel.3		\

ares/Makefile.vc6

+34 −34
Original line number Original line Diff line number Diff line
@@ -159,117 +159,117 @@ vclean realclean: clean 
#

#

# Copyright "gcc -MM .."

# 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

  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

  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

  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

  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

  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

  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

  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

  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     \

  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h     \

  ares_rules.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

  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

  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        \

  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h        \

  ares_build.h ares_rules.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

  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

  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

  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_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h         \

  ares_library_init.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

  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

  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

  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

  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

  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

  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          \

  nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h          \

  ares_rules.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

  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

  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          \

  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \

  ares_build.h ares_rules.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      \

  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

  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          \

  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \

  ares_build.h ares_rules.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         \

  nameser.h ares.h ares_private.h ares_ipv6.h inet_ntop.h ares_build.h         \

  ares_rules.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

  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)\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

  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           \

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

  ares_rules.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

  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

  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
 
  ares_writev.h ares_build.h ares_rules.h

ares/acountry.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * without express or implied warranty.

 * without express or implied warranty.

 */

 */





#include "setup.h"

#include "ares_setup.h"





#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>