From: Danny Mayer <mayer@ntp.org>
Date: Sun, 27 Dec 2009 21:35:25 +0000 (+0000)
Subject: [Bug 1442] Move Windows functions into libntp files
X-Git-Tag: NTP_4_2_7P6~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd0638462c1b5207cc6c8881d43748b70707a6d5;p=thirdparty%2Fntp.git

[Bug 1442] Move Windows functions into libntp files

bk: 4b37d31dI4hAAJ8RXxftk8VJwYLYwA
---

diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp
index 3eaebea23..e0f66ff51 100644
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -422,6 +422,10 @@ SOURCE=..\..\..\libntp\tsftomsu.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\libntp\termios.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\libntp\tstotv.c
 # End Source File
 # Begin Source File
@@ -442,6 +446,10 @@ SOURCE=..\libntp\util_clockstuff.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\libntp\win32_io.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\lib\isc\win32\win32os.c
 # End Source File
 # Begin Source File
@@ -646,6 +654,10 @@ SOURCE=..\include\sys\time.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\termios.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\win32_io.h
 # End Source File
 # Begin Source File
diff --git a/ports/winnt/vc6/ntp.dsw b/ports/winnt/vc6/ntp.dsw
index 3465593b1..6afc4d172 100644
--- a/ports/winnt/vc6/ntp.dsw
+++ b/ports/winnt/vc6/ntp.dsw
@@ -78,8 +78,12 @@ Package=<5>
 {{{
 }}}
 
+Package=<4>
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libntp
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/ports/winnt/vc6/ntpd.dsp b/ports/winnt/vc6/ntpd.dsp
index 7730294fb..032873278 100644
--- a/ports/winnt/vc6/ntpd.dsp
+++ b/ports/winnt/vc6/ntpd.dsp
@@ -203,12 +203,6 @@ SOURCE=..\ntpd\ntservice.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\ntpd\win32_io.c
-# SUBTRACT CPP /YX
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
diff --git a/ports/winnt/vs2003/libntp.vcproj b/ports/winnt/vs2003/libntp.vcproj
index 15b8b1a8b..1fadf2c2a 100644
--- a/ports/winnt/vs2003/libntp.vcproj
+++ b/ports/winnt/vs2003/libntp.vcproj
@@ -1683,6 +1683,27 @@
 			<File
 				RelativePath="..\..\..\lib\isc\win32\time.c">
 			</File>
+			<File
+				RelativePath="..\..\..\libntp\termios.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\libntp\tsftomsu.c">
 				<FileConfiguration
@@ -1809,6 +1830,27 @@
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\libntp\win32_io.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\lib\isc\win32\win32os.c">
 				<FileConfiguration
diff --git a/ports/winnt/vs2003/ntp.sln b/ports/winnt/vs2003/ntp.sln
index f06c4fc99..f8c493959 100644
--- a/ports/winnt/vs2003/ntp.sln
+++ b/ports/winnt/vs2003/ntp.sln
@@ -24,6 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdc", "ntpdc.vcproj", "{1
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntpkeygen.vcproj", "{48A390CC-217F-4462-9A0B-53D791ACCEF6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C0DB2E48-1AF2-40D0-8F8A-CC73C47FFE55} = {C0DB2E48-1AF2-40D0-8F8A-CC73C47FFE55}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq.vcproj", "{0B4DE997-6C90-481F-8A92-554A155D1314}"
diff --git a/ports/winnt/vs2003/ntpd.vcproj b/ports/winnt/vs2003/ntpd.vcproj
index 7799ce91e..5ca9f61dd 100644
--- a/ports/winnt/vs2003/ntpd.vcproj
+++ b/ports/winnt/vs2003/ntpd.vcproj
@@ -688,29 +688,6 @@
 						BrowseInformation="1"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\ntpd\win32_io.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"