Fix move results for vc6

bk: 4b5bd7b7nCIAtpA7XKUoVN4tGDIBWg

diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp
index b31f9f5697ab1686c28831336eb68c62a065373f..64fa5bb0a1a2b43c43edcf6bd35f8b9cfa8c4e03 100644 (file)
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -86,6 +86,14 @@ 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
@@ -122,11 +130,11 @@ SOURCE=..\..\..\libntp\authusekey.c
 # 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
-SOURCE=..\..\..\libntp\buftvtots.c\r
+SOURCE=..\..\..\lib\isc\buffer.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -194,10 +202,6 @@ 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,6 +242,10 @@ SOURCE=..\..\..\libntp\iosignal.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=..\..\..\lib\isc\lib.c\r
 # End Source File\r
 # Begin Source File\r
@@ -362,10 +370,6 @@ 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,10 +394,6 @@ 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
@@ -490,11 +490,11 @@ SOURCE=..\include\arpa\inet.h
 # 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
-SOURCE=..\include\inttypes.h\r
+SOURCE=..\..\..\include\isc\interfaceiter.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -705,7 +705,7 @@ BuildCmds= \
 \r
 # PROP Ignore_Default_Tool 1\r
 # Begin Custom Build - Message Compiler\r
-InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp\r
+InputDir=.\r
 InputPath=..\libntp\messages.mc\r
 InputName=messages\r
 \r

diff --git a/ports/winnt/vc6/ntpd.dsp b/ports/winnt/vc6/ntpd.dsp
index 1b7b6fa311c50c8ec37a4347247cbe426aec6301..0328732785afa0ff74e99154ee8f736e5f2d4732 100644 (file)
--- a/ports/winnt/vc6/ntpd.dsp
+++ b/ports/winnt/vc6/ntpd.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\..\..\ntpd" /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /c\r
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /YX"windows.h" /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\ntpd" /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /I "$(OPENSSL_INC)" /I "..\..\..\libopts" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1 /D "_CRT_SECURE_NO_DEPRECATE" /FR /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
@@ -201,8 +201,7 @@ SOURCE=..\..\..\ntpd\ntpd.c
 \r
 SOURCE=..\ntpd\ntservice.c\r
 # End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
+# Begin Source File\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r