[Bug 1448] Additional fixes for Windows VC6

bk: 4b528ffa2CNUKUDnku35urtii8xrRg

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index e53d4b318e1d4b66bc4a38aebf0e5de87312599f..784364d50e589b8de890b43fc857a3cd37ba328b 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -47,11 +47,11 @@
 #define ISC_NET_PORTRANGEHIGH 65535
 #endif /* ISC_NET_PORTRANGEHIGH */
 
-#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
+#if defined(ISC_PLATFORM_NEEDIN6ADDRANY)
 const struct in6_addr isc_net_in6addrany = IN6ADDR_ANY_INIT;
 #endif
 
-#if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
+#if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
 const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT;
 #endif
 

diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp
index f209e179e1e25def6bffd15f13228621fced151e..e10ff4fbc77ed15ae0b8351a6c8eaa3b52629142 100644 (file)
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -86,14 +86,6 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\libntp\getclock.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\libntp\setpriority.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\libntp\a_md5encrypt.c\r
 # End Source File\r
 # Begin Source File\r
@@ -130,11 +122,11 @@ SOURCE=..\..\..\libntp\authusekey.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\libntp\buftvtots.c\r
+SOURCE=..\..\..\lib\isc\buffer.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\lib\isc\buffer.c\r
+SOURCE=..\..\..\libntp\buftvtots.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -166,6 +158,10 @@ SOURCE=..\..\..\libntp\decodenetnum.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\libntp\dnslookup.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\libntp\dofptoa.c\r
 # End Source File\r
 # Begin Source File\r
@@ -198,6 +194,10 @@ SOURCE=..\..\..\libntp\fptoms.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\libntp\getclock.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\libntp\getopt.c\r
 # End Source File\r
 # Begin Source File\r
@@ -238,7 +238,7 @@ SOURCE=..\..\..\libntp\iosignal.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\lib\isc\win32\strerror.c\r
+SOURCE=..\..\..\lib\isc\win32\ipv6.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -366,6 +366,10 @@ SOURCE=..\..\..\libntp\refnumtoa.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\libntp\setpriority.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libntp\SetSystemTime.c\r
 # End Source File\r
 # Begin Source File\r
@@ -390,6 +394,10 @@ SOURCE=..\..\..\libntp\statestr.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\lib\isc\win32\strerror.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libntp\syslog.c\r
 # End Source File\r
 # Begin Source File\r
@@ -482,11 +490,11 @@ SOURCE=..\include\arpa\inet.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\include\inttypes.h\r
+SOURCE=..\..\..\include\isc\interfaceiter.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\include\isc\interfaceiter.h\r
+SOURCE=..\include\inttypes.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -676,7 +684,7 @@ SOURCE=..\libntp\messages.mc
 \r
 # PROP Ignore_Default_Tool 1\r
 # Begin Custom Build - Message Compiler\r
-InputDir=.\r
+InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp\r
 InputPath=..\libntp\messages.mc\r
 InputName=messages\r
 \r
@@ -697,7 +705,7 @@ BuildCmds= \
 \r
 # PROP Ignore_Default_Tool 1\r
 # Begin Custom Build - Message Compiler\r
-InputDir=.\r
+InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp\r
 InputPath=..\libntp\messages.mc\r
 InputName=messages\r
 \r