From: Danny Mayer <mayer@ntp.org>
Date: Sun, 17 Jan 2010 04:20:10 +0000 (-0500)
Subject: [Bug 1448] Additional fixes for Windows VC6
X-Git-Tag: NTP_4_2_6P1_RC3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c163fde5b03e2f569fbc7777ac1e17ff51fb28d9;p=thirdparty%2Fntp.git

[Bug 1448] Additional fixes for Windows VC6

bk: 4b528ffa2CNUKUDnku35urtii8xrRg
---

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index e53d4b318..784364d50 100644
--- 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 f209e179e..e10ff4fbc 100644
--- 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"
 # Begin Source File
 
-SOURCE=..\libntp\getclock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libntp\setpriority.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\libntp\a_md5encrypt.c
 # End Source File
 # Begin Source File
@@ -130,11 +122,11 @@ SOURCE=..\..\..\libntp\authusekey.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\libntp\buftvtots.c
+SOURCE=..\..\..\lib\isc\buffer.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\lib\isc\buffer.c
+SOURCE=..\..\..\libntp\buftvtots.c
 # End Source File
 # Begin Source File
 
@@ -166,6 +158,10 @@ SOURCE=..\..\..\libntp\decodenetnum.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\libntp\dnslookup.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\libntp\dofptoa.c
 # End Source File
 # Begin Source File
@@ -198,6 +194,10 @@ SOURCE=..\..\..\libntp\fptoms.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\libntp\getclock.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\libntp\getopt.c
 # End Source File
 # Begin Source File
@@ -238,7 +238,7 @@ SOURCE=..\..\..\libntp\iosignal.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\lib\isc\win32\strerror.c
+SOURCE=..\..\..\lib\isc\win32\ipv6.c
 # End Source File
 # Begin Source File
 
@@ -366,6 +366,10 @@ SOURCE=..\..\..\libntp\refnumtoa.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\libntp\setpriority.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libntp\SetSystemTime.c
 # End Source File
 # Begin Source File
@@ -390,6 +394,10 @@ SOURCE=..\..\..\libntp\statestr.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\lib\isc\win32\strerror.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libntp\syslog.c
 # End Source File
 # Begin Source File
@@ -482,11 +490,11 @@ SOURCE=..\include\arpa\inet.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\inttypes.h
+SOURCE=..\..\..\include\isc\interfaceiter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\include\isc\interfaceiter.h
+SOURCE=..\include\inttypes.h
 # End Source File
 # Begin Source File
 
@@ -676,7 +684,7 @@ SOURCE=..\libntp\messages.mc
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Message Compiler
-InputDir=.
+InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp
 InputPath=..\libntp\messages.mc
 InputName=messages
 
@@ -697,7 +705,7 @@ BuildCmds= \
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Message Compiler
-InputDir=.
+InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp
 InputPath=..\libntp\messages.mc
 InputName=messages