cope with ares_build.h and ares_rules.h

6 files changed, 290 insertions, 268 deletions

diff --git a/ares/Makefile.m32 b/ares/Makefile.m32
index 6cce1c8f1..120aad3c0 100644
--- a/ares/Makefile.m32
+++ b/ares/Makefile.m32
@@ -40,7 +40,7 @@ tags:
 %.exe: %.o ares_getopt.o $(LIB)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-$(OBJLIB): ares.h ares_dns.h ares_private.h
+$(OBJLIB): ares.h ares_dns.h ares_private.h ares_build.h ares_rules.h
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<
@@ -55,7 +55,8 @@ install:
 	${RANLIB} ${DESTDIR}${libdir}/$(LIB)
 	chmod u-w ${DESTDIR}${libdir}/$(LIB)
 	${INSTALL} -m 444 ${srcdir}/ares.h ${DESTDIR}${includedir}
-	${INSTALL} -m 444 ${srcdir}/ares_version.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_build.h ${DESTDIR}${includedir}
+	${INSTALL} -m 444 ${srcdir}/ares_rules.h ${DESTDIR}${includedir}
 	(for man in $(MANPAGES); do \
 	   ${INSTALL} -m 444 ${srcdir}/$${man} ${DESTDIR}${mandir}/man3; \
 	done)
diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6
index 191142eb2..3c66a9a2d 100644
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -1,254 +1,267 @@
-# $Id$
-#
-# C-ares makefile for MSVC6+
-# G. Vanem <giva@bgnett.no>.
-#
-
-CFG_MODEL   = MD
-DEBUG_MODEL = d
-USE_WATT32  = 0
-
-#
-# Configurations:
-#  -MD   - msvcrt.dll,  threads, release (normal)
-#  -MDd  - msvcrtd.dll, threads, debug
-#  -ML   - libc, no threads,     release
-#  -MLd  - libc, no threads,     debug
-#  -MT   - libc, threads,        release
-#  -MTd  - libc, threads,        debug
-
-CC = cl
-
-CFLAGS  = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi
-LDFLAGS = -machine:i386 -map
-
-OBJ_DIR  = VC6_obj
-DEF_FILE = cares.def
-
-!if "$(USE_WATT32)" == "1"
-CFLAGS  = $(CFLAGS) -UWIN32 -DWATT32 -D_USE_32BIT_TIME_T -I$(WATT_ROOT)\inc
-EX_LIBS = $(WATT_ROOT)\lib\wattcpvc_imp.lib
-
-!else
-CFLAGS  = $(CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN
-EX_LIBS = advapi32.lib ws2_32.lib
-!endif
-
-!if "$(DEBUG_MODEL)" == "d"
-CFLAGS  = $(CFLAGS) -D_DEBUG -GZ
-LDFLAGS = $(LDFLAGS) -debug -fixed:no
-
-!else
-CFLAGS  = $(CFLAGS) -O2 -Og
-LDFLAGS = $(LDFLAGS) -release
-!endif
-
-OBJECTS = $(OBJ_DIR)\ares_fds.obj              \
-          $(OBJ_DIR)\ares_process.obj          \
-          $(OBJ_DIR)\ares_free_hostent.obj     \
-          $(OBJ_DIR)\ares_query.obj            \
-          $(OBJ_DIR)\ares__close_sockets.obj   \
-          $(OBJ_DIR)\ares_free_string.obj      \
-          $(OBJ_DIR)\ares_search.obj           \
-          $(OBJ_DIR)\ares__get_hostent.obj     \
-          $(OBJ_DIR)\ares_gethostbyaddr.obj    \
-          $(OBJ_DIR)\ares_getsock.obj          \
-          $(OBJ_DIR)\ares_send.obj             \
-          $(OBJ_DIR)\ares__read_line.obj       \
-          $(OBJ_DIR)\ares_gethostbyname.obj    \
-          $(OBJ_DIR)\ares_getnameinfo.obj      \
-          $(OBJ_DIR)\ares_strcasecmp.obj       \
-          $(OBJ_DIR)\ares_strerror.obj         \
-          $(OBJ_DIR)\ares_cancel.obj           \
-          $(OBJ_DIR)\ares_init.obj             \
-          $(OBJ_DIR)\ares_llist.obj            \
-          $(OBJ_DIR)\ares_timeout.obj          \
-          $(OBJ_DIR)\ares__timeval.obj         \
-          $(OBJ_DIR)\ares_destroy.obj          \
-          $(OBJ_DIR)\ares_mkquery.obj          \
-          $(OBJ_DIR)\ares_version.obj          \
-          $(OBJ_DIR)\ares_expand_name.obj      \
-          $(OBJ_DIR)\ares_parse_a_reply.obj    \
-          $(OBJ_DIR)\ares_parse_aaaa_reply.obj \
-          $(OBJ_DIR)\ares_parse_ns_reply.obj   \
-          $(OBJ_DIR)\windows_port.obj          \
-          $(OBJ_DIR)\ares_expand_string.obj    \
-          $(OBJ_DIR)\ares_parse_ptr_reply.obj  \
-          $(OBJ_DIR)\ares_writev.obj           \
-          $(OBJ_DIR)\bitncmp.obj               \
-          $(OBJ_DIR)\inet_net_pton.obj         \
-          $(OBJ_DIR)\inet_ntop.obj
-
-all: $(OBJ_DIR) cares.lib cares.dll cares_imp.lib ahost.exe adig.exe acountry.exe
-       @echo Welcome to c-ares library and examples
-
-$(OBJ_DIR):
-       mkdir $(OBJ_DIR)
-
-cares.lib: $(OBJ_DIR) $(OBJECTS)
-       lib -nologo -out:$@ $(OBJECTS)
-
-cares_imp.lib cares.dll: $(OBJ_DIR) $(DEF_FILE) $(OBJECTS)
-       link $(LDFLAGS) -dll -implib:cares_imp.lib -out:cares.dll \
-            -def:$(DEF_FILE) $(OBJECTS) $(EX_LIBS)
-
-$(DEF_FILE): $(OBJECTS) Makefile.VC6
-       @echo ; Generated. DO NOT EDIT  > $@
-       @echo LIBRARY cares.dll        >> $@
-       @echo EXPORTS                  >> $@
-       @echo   ares_cancel            >> $@
-       @echo   ares_destroy           >> $@
-       @echo   ares_expand_name       >> $@
-       @echo   ares_expand_string     >> $@
-       @echo   ares_fds               >> $@
-       @echo   ares_free_hostent      >> $@
-       @echo   ares_free_string       >> $@
-       @echo   ares_gethostbyaddr     >> $@
-       @echo   ares_gethostbyname     >> $@
-       @echo   ares_getsock           >> $@
-       @echo   ares_init              >> $@
-       @echo   ares_init_options      >> $@
-       @echo   ares_mkquery           >> $@
-       @echo   ares_parse_a_reply     >> $@
-       @echo   ares_parse_ptr_reply   >> $@
-       @echo   ares_parse_ns_reply    >> $@
-       @echo   ares_process           >> $@
-       @echo   ares_process_fd        >> $@
-       @echo   ares_query             >> $@
-       @echo   ares_search            >> $@
-       @echo   ares_strerror          >> $@
-       @echo   ares_strncasecmp       >> $@
-       @echo   ares_strcasecmp        >> $@
-       @echo   ares_timeout           >> $@
-       @echo   ares_version           >> $@
-       @echo   ares_inet_net_pton     >> $@
-       @echo   ares_inet_ntop         >> $@
-       @echo   ares_inet_pton         >> $@
-       @echo   ares_getnameinfo       >> $@
-       @echo   ares_parse_aaaa_reply  >> $@
-!if "$(USE_WATT32)" == "0"
-       @echo   ares_writev            >> $@
-!endif
-
-ahost.exe: $(OBJ_DIR) $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib
-       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)
-
-adig.exe: $(OBJ_DIR) $(OBJ_DIR)\adig.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib
-       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\adig.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)
-
-acountry.exe: $(OBJ_DIR) $(OBJ_DIR)\acountry.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib
-       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\acountry.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)
-
-clean:
-       - del $(OBJ_DIR)\*.obj *.ilk *.pdb *.pbt *.pbi *.pbo *._xe *.map
-
-vclean realclean: clean
-       - del $(DEF_FILE) cares.lib cares_imp.* cares.dll
-       - del ahost.exe adig.exe acountry.exe
-       - rd $(OBJ_DIR)
-
-.c{$(OBJ_DIR)}.obj:
-       $(CC) $(CFLAGS) -Fo$*.obj -c $<
-
-#
-# Copyright "gcc -MM .."
-#
-$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h
-
-$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h setup_once.h nameser.h     \
-  ares.h ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h setup_once.h     \
-  ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h setup_once.h nameser.h         \
-  ares.h ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h setup_once.h \
-  ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h setup_once.h ares.h
-
-$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h setup_once.h nameser.h       \
-  ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h setup_once.h     \
-  ares.h ares_private.h ares_ipv6.h inet_net_pton.h
-
-$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h setup_once.h   \
-  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h
-
-$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h setup_once.h nameser.h ares.h    \
-  ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h setup_once.h ares.h  \
-  ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.h   \
-  nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h
-
-$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c setup.h setup_once.h ares.h
-
-$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h setup_once.h ares.h
-
-$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \
-  ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h setup_once.h nameser.h ares.h    \
-  ares_private.h ares_ipv6.h inet_net_pton.h
-
-$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h setup_once.h ares.h        \
-  ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares__timeval.obj: ares__timeval.c setup.h setup_once.h ares.h      \
-  ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h setup_once.h ares.h        \
-  ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h setup_once.h nameser.h     \
-  ares.h ares_dns.h
-
-$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h setup_once.h ares_version.h
-
-$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h setup_once.h       \
-  nameser.h ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h setup_once.h   \
-  nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h setup_once.h nameser.h     \
-  ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h setup_once.h   \
-  nameser.h ares.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h            \
-  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h          \
-  setup_once.h nameser.h ares.h ares_dns.h inet_net_pton.h ares_private.h      \
-  ares_ipv6.h
-
-$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c setup.h              \
-  setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h
-
-$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h setup_once.h       \
-  nameser.h ares.h ares_private.h ares_ipv6.h inet_ntop.h
-
-$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h setup_once.h nameser.h   \
-  ares_ipv6.h inet_net_pton.h
-
-$(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h
-
-$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h setup_once.h nameser.h           \
-  ares_ipv6.h inet_ntop.h
-
-$(OBJ_DIR)\ares_getopt.obj: ares_getopt.c ares_getopt.h
-
-$(OBJ_DIR)\ares_llist.obj: ares_llist.c setup.h setup_once.h ares.h            \
-  ares_private.h ares_llist.h
-
-$(OBJ_DIR)\ares_writev.obj: ares_writev.c setup.h setup_once.h ares.h          \
-  ares_writev.h
+# $Id$

+#

+# C-ares makefile for MSVC6+

+# G. Vanem <giva@bgnett.no>.

+#

+

+CFG_MODEL   = MD

+DEBUG_MODEL = d

+USE_WATT32  = 0

+

+#

+# Configurations:

+#  -MD   - msvcrt.dll,  threads, release (normal)

+#  -MDd  - msvcrtd.dll, threads, debug

+#  -ML   - libc, no threads,     release

+#  -MLd  - libc, no threads,     debug

+#  -MT   - libc, threads,        release

+#  -MTd  - libc, threads,        debug

+

+CC = cl

+

+CFLAGS  = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi

+LDFLAGS = -machine:i386 -map

+

+OBJ_DIR  = VC6_obj

+DEF_FILE = cares.def

+

+!if "$(USE_WATT32)" == "1"

+CFLAGS  = $(CFLAGS) -UWIN32 -DWATT32 -D_USE_32BIT_TIME_T -I$(WATT_ROOT)\inc

+EX_LIBS = $(WATT_ROOT)\lib\wattcpvc_imp.lib

+

+!else

+CFLAGS  = $(CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN

+EX_LIBS = advapi32.lib ws2_32.lib

+!endif

+

+!if "$(DEBUG_MODEL)" == "d"

+CFLAGS  = $(CFLAGS) -D_DEBUG -GZ

+LDFLAGS = $(LDFLAGS) -debug -fixed:no

+

+!else

+CFLAGS  = $(CFLAGS) -O2 -Og

+LDFLAGS = $(LDFLAGS) -release

+!endif

+

+CFLAGS  = -I.\.

+

+OBJECTS = $(OBJ_DIR)\ares_fds.obj              \

+          $(OBJ_DIR)\ares_process.obj          \

+          $(OBJ_DIR)\ares_free_hostent.obj     \

+          $(OBJ_DIR)\ares_query.obj            \

+          $(OBJ_DIR)\ares__close_sockets.obj   \

+          $(OBJ_DIR)\ares_free_string.obj      \

+          $(OBJ_DIR)\ares_search.obj           \

+          $(OBJ_DIR)\ares__get_hostent.obj     \

+          $(OBJ_DIR)\ares_gethostbyaddr.obj    \

+          $(OBJ_DIR)\ares_getsock.obj          \

+          $(OBJ_DIR)\ares_send.obj             \

+          $(OBJ_DIR)\ares__read_line.obj       \

+          $(OBJ_DIR)\ares_gethostbyname.obj    \

+          $(OBJ_DIR)\ares_getnameinfo.obj      \

+          $(OBJ_DIR)\ares_strcasecmp.obj       \

+          $(OBJ_DIR)\ares_strerror.obj         \

+          $(OBJ_DIR)\ares_cancel.obj           \

+          $(OBJ_DIR)\ares_init.obj             \

+          $(OBJ_DIR)\ares_llist.obj            \

+          $(OBJ_DIR)\ares_timeout.obj          \

+          $(OBJ_DIR)\ares__timeval.obj         \

+          $(OBJ_DIR)\ares_destroy.obj          \

+          $(OBJ_DIR)\ares_mkquery.obj          \

+          $(OBJ_DIR)\ares_version.obj          \

+          $(OBJ_DIR)\ares_expand_name.obj      \

+          $(OBJ_DIR)\ares_parse_a_reply.obj    \

+          $(OBJ_DIR)\ares_parse_aaaa_reply.obj \

+          $(OBJ_DIR)\ares_parse_ns_reply.obj   \

+          $(OBJ_DIR)\windows_port.obj          \

+          $(OBJ_DIR)\ares_expand_string.obj    \

+          $(OBJ_DIR)\ares_parse_ptr_reply.obj  \

+          $(OBJ_DIR)\ares_writev.obj           \

+          $(OBJ_DIR)\bitncmp.obj               \

+          $(OBJ_DIR)\inet_net_pton.obj         \

+          $(OBJ_DIR)\inet_ntop.obj

+

+all: $(OBJ_DIR) cares.lib cares.dll cares_imp.lib ahost.exe adig.exe acountry.exe

+       @echo Welcome to c-ares library and examples

+

+$(OBJ_DIR):

+       mkdir $(OBJ_DIR)

+

+cares.lib: $(OBJ_DIR) $(OBJECTS)

+       lib -nologo -out:$@ $(OBJECTS)

+

+cares_imp.lib cares.dll: $(OBJ_DIR) $(DEF_FILE) $(OBJECTS)

+       link $(LDFLAGS) -dll -implib:cares_imp.lib -out:cares.dll \

+            -def:$(DEF_FILE) $(OBJECTS) $(EX_LIBS)

+

+$(DEF_FILE): $(OBJECTS) Makefile.VC6

+       @echo ; Generated. DO NOT EDIT  > $@

+       @echo LIBRARY cares.dll        >> $@

+       @echo EXPORTS                  >> $@

+       @echo   ares_cancel            >> $@

+       @echo   ares_destroy           >> $@

+       @echo   ares_expand_name       >> $@

+       @echo   ares_expand_string     >> $@

+       @echo   ares_fds               >> $@

+       @echo   ares_free_hostent      >> $@

+       @echo   ares_free_string       >> $@

+       @echo   ares_gethostbyaddr     >> $@

+       @echo   ares_gethostbyname     >> $@

+       @echo   ares_getsock           >> $@

+       @echo   ares_init              >> $@

+       @echo   ares_init_options      >> $@

+       @echo   ares_mkquery           >> $@

+       @echo   ares_parse_a_reply     >> $@

+       @echo   ares_parse_ptr_reply   >> $@

+       @echo   ares_parse_ns_reply    >> $@

+       @echo   ares_process           >> $@

+       @echo   ares_process_fd        >> $@

+       @echo   ares_query             >> $@

+       @echo   ares_search            >> $@

+       @echo   ares_strerror          >> $@

+       @echo   ares_strncasecmp       >> $@

+       @echo   ares_strcasecmp        >> $@

+       @echo   ares_timeout           >> $@

+       @echo   ares_version           >> $@

+       @echo   ares_inet_net_pton     >> $@

+       @echo   ares_inet_ntop         >> $@

+       @echo   ares_inet_pton         >> $@

+       @echo   ares_getnameinfo       >> $@

+       @echo   ares_parse_aaaa_reply  >> $@

+!if "$(USE_WATT32)" == "0"

+       @echo   ares_writev            >> $@

+!endif

+

+ahost.exe: $(OBJ_DIR) $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib

+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\ahost.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)

+

+adig.exe: $(OBJ_DIR) $(OBJ_DIR)\adig.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib

+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\adig.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)

+

+acountry.exe: $(OBJ_DIR) $(OBJ_DIR)\acountry.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib

+       link $(LDFLAGS) -out:$@ $(OBJ_DIR)\acountry.obj $(OBJ_DIR)\ares_getopt.obj cares_imp.lib $(EX_LIBS)

+

+clean:

+       - del $(OBJ_DIR)\*.obj *.ilk *.pdb *.pbt *.pbi *.pbo *._xe *.map

+

+vclean realclean: clean

+       - del $(DEF_FILE) cares.lib cares_imp.* cares.dll

+       - del ahost.exe adig.exe acountry.exe

+       - rd $(OBJ_DIR)

+

+.c{$(OBJ_DIR)}.obj:

+       $(CC) $(CFLAGS) -Fo$*.obj -c $<

+

+#

+# Copyright "gcc -MM .."

+#

+$(OBJ_DIR)\ares_fds.obj: ares_fds.c 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     \

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

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

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

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

+  ares.h ares_build.h ares_rules.h

+

+$(OBJ_DIR)\ares_search.obj: ares_search.c 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     \

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

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

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

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

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

+  ares_build.h ares_rules.h

+

+$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c 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          \

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

+  ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h

+

+$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c 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      \

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

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

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

+

+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c 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   \

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

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

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

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

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

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

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

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

+  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_llist.obj: ares_llist.c 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          \

+  ares_writev.h ares_build.h ares_rules.h

diff --git a/ares/vc/acountry/acountry.dsp b/ares/vc/acountry/acountry.dsp
index c5aa6a32a..9442f5072 100644
--- a/ares/vc/acountry/acountry.dsp
+++ b/ares/vc/acountry/acountry.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/ares/vc/adig/adig.dsp b/ares/vc/adig/adig.dsp
index 57d30dca3..757d7bb54 100644
--- a/ares/vc/adig/adig.dsp
+++ b/ares/vc/adig/adig.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/ares/vc/ahost/ahost.dsp b/ares/vc/ahost/ahost.dsp
index 28fbff69e..914eb6e4d 100644
--- a/ares/vc/ahost/ahost.dsp
+++ b/ares/vc/ahost/ahost.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/ares/vc/areslib/areslib.dsp b/ares/vc/areslib/areslib.dsp
index 2862afd8d..92bb4cd5b 100644
--- a/ares/vc/areslib/areslib.dsp
+++ b/ares/vc/areslib/areslib.dsp
@@ -225,6 +225,10 @@ SOURCE=..\..\ares.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\ares_build.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\ares_dns.h

 # End Source File

 # Begin Source File

@@ -241,6 +245,10 @@ SOURCE=..\..\ares_private.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\ares_rules.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\ares_strcasecmp.h

 # End Source File

 # Begin Source File