[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 3eaebea23c56d09dfebe076d29b3977d3965c957..e0f66ff5106edbe52119c94265b5a021393dc604 100644 (file)
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -422,6 +422,10 @@ SOURCE=..\..\..\libntp\tsftomsu.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\libntp\termios.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\libntp\tstotv.c\r
 # End Source File\r
 # Begin Source File\r
@@ -442,6 +446,10 @@ SOURCE=..\libntp\util_clockstuff.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\libntp\win32_io.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\lib\isc\win32\win32os.c\r
 # End Source File\r
 # Begin Source File\r
@@ -646,6 +654,10 @@ SOURCE=..\include\sys\time.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\include\termios.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\include\win32_io.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/ports/winnt/vc6/ntp.dsw b/ports/winnt/vc6/ntp.dsw
index 3465593b1eb3b0db5bd10f6bda229aaccba8c0d2..6afc4d172f58dbb47781fb38ceaf44fbb3bcee8a 100644 (file)
--- a/ports/winnt/vc6/ntp.dsw
+++ b/ports/winnt/vc6/ntp.dsw
@@ -78,8 +78,12 @@ Package=<5>
 {{{\r
 }}}\r
 \r
+Package=<4>\r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libntp\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r

diff --git a/ports/winnt/vc6/ntpd.dsp b/ports/winnt/vc6/ntpd.dsp
index 7730294fbfaea136af2260ac519d8537b3b2196c..0328732785afa0ff74e99154ee8f736e5f2d4732 100644 (file)
--- a/ports/winnt/vc6/ntpd.dsp
+++ b/ports/winnt/vc6/ntpd.dsp
@@ -203,12 +203,6 @@ SOURCE=..\ntpd\ntservice.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ntpd\win32_io.c\r
-# SUBTRACT CPP /YX\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r

diff --git a/ports/winnt/vs2003/libntp.vcproj b/ports/winnt/vs2003/libntp.vcproj
index 15b8b1a8bfd709bfe6399e3688099a4a2b55f7cc..1fadf2c2a4e7d0c1a182d89cb93c15784dd14907 100644 (file)
--- 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 f06c4fc99b22a8e41eeb02fa54e797d3cc56605e..f8c493959d2e91140218c92f60e5101be4fd9a77 100644 (file)
--- 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 7799ce91e463687f15a35a00fb8ac838ab7208f7..5ca9f61dd1ee9c8026f5eb6b4642c9cb0fe6bbfb 100644 (file)
--- 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"