From: Danny Mayer Date: Sun, 24 Jan 2010 05:16:39 +0000 (-0500) Subject: Fix move results for vc6 X-Git-Tag: NTP_4_2_7P10~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45e6c0ca8f182d6275507dd816f1fe217a67083;p=thirdparty%2Fntp.git Fix move results for vc6 bk: 4b5bd7b7nCIAtpA7XKUoVN4tGDIBWg --- diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp index b31f9f569..64fa5bb0a 100644 --- 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" # 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 @@ -122,11 +130,11 @@ SOURCE=..\..\..\libntp\authusekey.c # End Source File # Begin Source File -SOURCE=..\..\..\lib\isc\buffer.c +SOURCE=..\..\..\libntp\buftvtots.c # End Source File # Begin Source File -SOURCE=..\..\..\libntp\buftvtots.c +SOURCE=..\..\..\lib\isc\buffer.c # End Source File # Begin Source File @@ -194,10 +202,6 @@ 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,6 +242,10 @@ SOURCE=..\..\..\libntp\iosignal.c # End Source File # Begin Source File +SOURCE=..\..\..\lib\isc\win32\strerror.c +# End Source File +# Begin Source File + SOURCE=..\..\..\lib\isc\lib.c # End Source File # Begin Source File @@ -362,10 +370,6 @@ 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,10 +394,6 @@ 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 @@ -490,11 +490,11 @@ SOURCE=..\include\arpa\inet.h # End Source File # Begin Source File -SOURCE=..\..\..\include\isc\interfaceiter.h +SOURCE=..\include\inttypes.h # End Source File # Begin Source File -SOURCE=..\include\inttypes.h +SOURCE=..\..\..\include\isc\interfaceiter.h # End Source File # Begin Source File @@ -705,7 +705,7 @@ BuildCmds= \ # PROP Ignore_Default_Tool 1 # Begin Custom Build - Message Compiler -InputDir=\ntp-4.2.6p1-RC2\ports\winnt\libntp +InputDir=. InputPath=..\libntp\messages.mc InputName=messages diff --git a/ports/winnt/vc6/ntpd.dsp b/ports/winnt/vc6/ntpd.dsp index 1b7b6fa31..032873278 100644 --- a/ports/winnt/vc6/ntpd.dsp +++ b/ports/winnt/vc6/ntpd.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# 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 +# 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 # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -201,8 +201,7 @@ SOURCE=..\..\..\ntpd\ntpd.c SOURCE=..\ntpd\ntservice.c # End Source File -# End Group -# Begin Group "Header Files" +# Begin Source File # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File