Commit 3fb04115 authored by Gisle Vanem's avatar Gisle Vanem
Browse files

Fixes for building with MSVC-6/7. Added inet*.c. 

Replace <winsock.h> with <winsock2.h> + <ws2tcpip.h>
(ala libcurl since IPv6 is not optional now).
parent 4faaa32a

ares/vc/areslib/areslib.dsp

+47 −15
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ RSC=rc.exe 
# PROP Intermediate_Dir "Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

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

# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /YX /FD /c

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

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

BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib 
# PROP Intermediate_Dir "Debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

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

# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /YX /FD /GZ /c

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

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

BSC32=bscmake.exe
@@ -97,6 +97,10 @@ SOURCE=..\..\ares__read_line.c 
# End Source File

# Begin Source File



SOURCE=..\..\ares_cancel.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_destroy.c

# End Source File

# Begin Source File
@@ -137,6 +141,10 @@ SOURCE=..\..\ares_parse_a_reply.c 
# End Source File

# Begin Source File



SOURCE=..\..\ares_parse_aaaa_reply.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_parse_ptr_reply.c

# End Source File

# Begin Source File
@@ -153,7 +161,15 @@ SOURCE=..\..\ares_search.c 
# End Source File

# Begin Source File



SOURCE=..\..\ares_cancel.c

SOURCE=..\..\ares_send.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_strerror.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_timeout.c

# End Source File

# Begin Source File
@@ -161,15 +177,15 @@ SOURCE=..\..\ares_version.c 
# End Source File

# Begin Source File



SOURCE=..\..\ares_send.c

SOURCE=..\..\bitncmp.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_strerror.c

SOURCE=..\..\inet_net_pton.c

# End Source File

# Begin Source File



SOURCE=..\..\ares_timeout.c

SOURCE=..\..\inet_ntop.c

# End Source File

# Begin Source File
@@ -189,7 +205,7 @@ SOURCE=..\..\ares_dns.h 
# End Source File

# Begin Source File



SOURCE=..\..\ares_version.h

SOURCE=..\..\ares_ipv6.h

# End Source File

# Begin Source File
@@ -197,6 +213,22 @@ SOURCE=..\..\ares_private.h 
# End Source File

# Begin Source File



SOURCE=..\..\ares_version.h

# End Source File

# Begin Source File



SOURCE=..\..\bitncmp.h

# End Source File

# Begin Source File



SOURCE=..\..\inet_net_pton.h

# End Source File

# Begin Source File



SOURCE=..\..\inet_ntop.h

# End Source File

# Begin Source File



SOURCE=..\..\nameser.h

# End Source File

# End Group

ares/vc/areslib/areslib.dsw

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Microsoft Developer Studio Workspace File, Format Version 6.00

# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!



###############################################################################



Project: "areslib"=.\areslib.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

}}}



###############################################################################



Global:



Package=<5>

{{{

}}}



Package=<3>

{{{

}}}



###############################################################################

ares/vc/areslib/areslib.mak

+85 −41
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CLEAN : 
	-@erase "$(INTDIR)\ares__close_sockets.obj"

	-@erase "$(INTDIR)\ares__get_hostent.obj"

	-@erase "$(INTDIR)\ares__read_line.obj"

	-@erase "$(INTDIR)\ares_cancel.obj"

	-@erase "$(INTDIR)\ares_destroy.obj"

	-@erase "$(INTDIR)\ares_expand_name.obj"

	-@erase "$(INTDIR)\ares_fds.obj"
@@ -53,6 +54,7 @@ CLEAN : 
	-@erase "$(INTDIR)\ares_init.obj"

	-@erase "$(INTDIR)\ares_mkquery.obj"

	-@erase "$(INTDIR)\ares_parse_a_reply.obj"

	-@erase "$(INTDIR)\ares_parse_aaaa_reply.obj"

	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"

	-@erase "$(INTDIR)\ares_process.obj"

	-@erase "$(INTDIR)\ares_query.obj"
@@ -60,6 +62,10 @@ CLEAN : 
	-@erase "$(INTDIR)\ares_send.obj"

	-@erase "$(INTDIR)\ares_strerror.obj"

	-@erase "$(INTDIR)\ares_timeout.obj"

	-@erase "$(INTDIR)\ares_version.obj"

	-@erase "$(INTDIR)\bitncmp.obj"

	-@erase "$(INTDIR)\inet_net_pton.obj"

	-@erase "$(INTDIR)\inet_ntop.obj"

	-@erase "$(INTDIR)\vc60.idb"

	-@erase "$(INTDIR)\windows_port.obj"

	-@erase "$(OUTDIR)\areslib.lib"
@@ -67,7 +73,7 @@ CLEAN : 
"$(OUTDIR)" :

    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"



CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c

CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

BSC32=bscmake.exe

BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 

BSC32_SBRS= \
@@ -97,7 +103,11 @@ LIB32_OBJS= \ 
	"$(INTDIR)\ares_send.obj" \

	"$(INTDIR)\ares_strerror.obj" \

	"$(INTDIR)\ares_timeout.obj" \

	"$(INTDIR)\windows_port.obj"

	"$(INTDIR)\windows_port.obj" \

	"$(INTDIR)\inet_ntop.obj" \

	"$(INTDIR)\inet_net_pton.obj" \

	"$(INTDIR)\bitncmp.obj" \

	"$(INTDIR)\ares_parse_aaaa_reply.obj"



"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)

    $(LIB32) @<<
@@ -119,6 +129,7 @@ CLEAN : 
	-@erase "$(INTDIR)\ares__close_sockets.obj"

	-@erase "$(INTDIR)\ares__get_hostent.obj"

	-@erase "$(INTDIR)\ares__read_line.obj"

	-@erase "$(INTDIR)\ares_cancel.obj"

	-@erase "$(INTDIR)\ares_destroy.obj"

	-@erase "$(INTDIR)\ares_expand_name.obj"

	-@erase "$(INTDIR)\ares_fds.obj"
@@ -129,15 +140,18 @@ CLEAN : 
	-@erase "$(INTDIR)\ares_init.obj"

	-@erase "$(INTDIR)\ares_mkquery.obj"

	-@erase "$(INTDIR)\ares_parse_a_reply.obj"

	-@erase "$(INTDIR)\ares_parse_aaaa_reply.obj"

	-@erase "$(INTDIR)\ares_parse_ptr_reply.obj"

	-@erase "$(INTDIR)\ares_process.obj"

	-@erase "$(INTDIR)\ares_query.obj"

	-@erase "$(INTDIR)\ares_search.obj"

	-@erase "$(INTDIR)\ares_cancel.obj"

	-@erase "$(INTDIR)\ares_version.obj"

	-@erase "$(INTDIR)\ares_send.obj"

	-@erase "$(INTDIR)\ares_strerror.obj"

	-@erase "$(INTDIR)\ares_timeout.obj"

	-@erase "$(INTDIR)\ares_version.obj"

	-@erase "$(INTDIR)\bitncmp.obj"

	-@erase "$(INTDIR)\inet_net_pton.obj"

	-@erase "$(INTDIR)\inet_ntop.obj"

	-@erase "$(INTDIR)\vc60.idb"

	-@erase "$(INTDIR)\vc60.pdb"

	-@erase "$(INTDIR)\windows_port.obj"
@@ -146,7 +160,7 @@ CLEAN : 
"$(OUTDIR)" :

    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"



CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ  /c

CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_IOCTLSOCKET" /D "HAVE_STRUCT_IN6_ADDR" /D "HAVE_AF_INET6" /D "HAVE_STRUCT_SOCKADDR_IN6" /D "HAVE_STRUCT_ADDRINFO" /Fp"$(INTDIR)\areslib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

BSC32=bscmake.exe

BSC32_FLAGS=/nologo /o"$(OUTDIR)\areslib.bsc" 

BSC32_SBRS= \
@@ -171,10 +185,16 @@ LIB32_OBJS= \ 
	"$(INTDIR)\ares_process.obj" \

	"$(INTDIR)\ares_query.obj" \

	"$(INTDIR)\ares_search.obj" \

	"$(INTDIR)\ares_cancel.obj" \

	"$(INTDIR)\ares_version.obj" \

	"$(INTDIR)\ares_send.obj" \

	"$(INTDIR)\ares_strerror.obj" \

	"$(INTDIR)\ares_timeout.obj" \

	"$(INTDIR)\windows_port.obj"

	"$(INTDIR)\windows_port.obj" \

	"$(INTDIR)\inet_ntop.obj" \

	"$(INTDIR)\inet_net_pton.obj" \

	"$(INTDIR)\bitncmp.obj" \

	"$(INTDIR)\ares_parse_aaaa_reply.obj"



"$(OUTDIR)\areslib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)

    $(LIB32) @<<
@@ -242,6 +262,12 @@ SOURCE=..\..\ares__read_line.c 
	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_cancel.c



"$(INTDIR)\ares_cancel.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_destroy.c



"$(INTDIR)\ares_destroy.obj" : $(SOURCE) "$(INTDIR)"
@@ -302,6 +328,12 @@ SOURCE=..\..\ares_parse_a_reply.c 
	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_parse_aaaa_reply.c



"$(INTDIR)\ares_parse_aaaa_reply.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_parse_ptr_reply.c



"$(INTDIR)\ares_parse_ptr_reply.obj" : $(SOURCE) "$(INTDIR)"
@@ -326,33 +358,45 @@ SOURCE=..\..\ares_search.c 
	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_version.c

SOURCE=..\..\ares_send.c



"$(INTDIR)\ares_version.obj" : $(SOURCE) "$(INTDIR)"

"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_cancel.c

SOURCE=..\..\ares_strerror.c



"$(INTDIR)\ares_cancel.obj" : $(SOURCE) "$(INTDIR)"

"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_send.c

SOURCE=..\..\ares_timeout.c



"$(INTDIR)\ares_send.obj" : $(SOURCE) "$(INTDIR)"

"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_strerror.c

SOURCE=..\..\ares_version.c



"$(INTDIR)\ares_strerror.obj" : $(SOURCE) "$(INTDIR)"

"$(INTDIR)\ares_version.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\ares_timeout.c

SOURCE=..\..\bitncmp.c



"$(INTDIR)\ares_timeout.obj" : $(SOURCE) "$(INTDIR)"

"$(INTDIR)\bitncmp.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\inet_net_pton.c



"$(INTDIR)\inet_net_pton.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)





SOURCE=..\..\inet_ntop.c



"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)"

	$(CPP) $(CPP_PROJ) $(SOURCE)