From: Dave Hart <hart@ntp.org>
Date: Sat, 11 Mar 2023 04:31:42 +0000 (-0500)
Subject: [Bug 3800] libopts-42.1.17 does not compile with Microsoft C.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63adbe188f1e4dd8685a5965e2a58d969401b64b;p=thirdparty%2Fntp.git

[Bug 3800] libopts-42.1.17 does not compile with Microsoft C.
Clean up [Bug 2525] changes by moving libisc source and header files into
  separate groups in the Visual Studio IDE.

bk: 640c042e-lEuquUmpYBmZiKFV-SdlQ
---

diff --git a/ChangeLog b/ChangeLog
index 7aba47a78..4843f182a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 ---
+* [Bug 3800] libopts-42.1.17 does not compile with Microsoft C. <hart@ntp.org>
 * [Bug 3797] Windows getaddrinfo w/AI_ADDRCONFIG fails for localhost when 
              disconnected, breaking ntpq and ntpdc. <hart@ntp.org>
 * [Bug 3795] pollskewlist documentation uses | when it shouldn't.
diff --git a/ports/winnt/vs2015/libntp/libntp.vcxproj.filters b/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
index 3c1677c35..fa765f3f0 100644
--- a/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2015/libntp/libntp.vcxproj.filters
@@ -15,6 +15,12 @@
     <Filter Include="Resource Files">
       <UniqueIdentifier>{723fb507-c0d4-4c49-bb1e-644e479d13d2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libisc Header Files">
+      <UniqueIdentifier>{d1cd5a9b-c4c7-463b-a1c6-77f120b1b0b1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libisc Source Files">
+      <UniqueIdentifier>{ed829a7e-4c71-4567-9c82-5f4caee37f03}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\libntp\a_md5encrypt.c">
@@ -26,9 +32,6 @@
     <ClCompile Include="..\..\libntp\arc4wrap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\assertions.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\atoint.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -50,15 +53,6 @@
     <ClCompile Include="..\..\..\..\libntp\authusekey.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\backtrace-emptytbl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\backtrace.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\buffer.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\buftvtots.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -77,9 +71,6 @@
     <ClCompile Include="..\..\..\..\libntp\clocktypes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\condition.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\decodenetnum.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -92,12 +83,6 @@
     <ClCompile Include="..\..\..\..\libntp\emalloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\error.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\event.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\findconfig.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -119,66 +104,33 @@
     <ClCompile Include="..\..\..\..\libntp\icom.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\inet_aton.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\inet_ntop.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\inet_pton.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\interfaceiter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\iosignal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\lib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\lib_strbuf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\sntp\libopts\libopts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\machines.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\mktime.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\modetoa.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\nls\msgcat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\mstolfp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\msyslog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\net.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\netaddr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\netof.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\netscope.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\ntp_calendar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -215,12 +167,6 @@
     <ClCompile Include="..\..\..\..\libntp\octtoint.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\once.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\ondestroy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\prettydate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -239,15 +185,9 @@
     <ClCompile Include="..\..\libntp\SetSystemTime.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\sha1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\snprintf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\sockaddr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\socket.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -263,15 +203,9 @@
     <ClCompile Include="..\..\..\..\libntp\statestr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\stdtime.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\strdup.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\strerror.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\strl_obsd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -284,18 +218,9 @@
     <ClCompile Include="..\..\..\..\libntp\systime.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\task.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\libntp\termios.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\thread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\time.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\timetoa.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -317,9 +242,6 @@
     <ClCompile Include="..\..\libntp\win32_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\win32\win32os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\work_fork.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -335,15 +257,96 @@
     <ClCompile Include="..\..\..\..\libntp\is_ip_address.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lib\isc\tsmemcmp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\libssl_compat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\libntp\ntp_realpath.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\assertions.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\backtrace.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\backtrace-emptytbl.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\buffer.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\condition.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\error.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\event.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\inet_ntop.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\inet_pton.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\interfaceiter.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\lib.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\log.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\md5.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\nls\msgcat.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\net.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\netaddr.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\netscope.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\once.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\ondestroy.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\sha1.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\sockaddr.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\stdtime.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\strerror.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\task.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\thread.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\time.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\tsmemcmp.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\libntp\lib\isc\win32\win32os.c">
+      <Filter>libisc Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h">
@@ -352,39 +355,24 @@
     <ClInclude Include="..\..\..\..\include\binio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\buffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\clockstuff.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\condition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\include\declcond.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\gaa_compat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\ieee754io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\arpa\inet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\intreswork.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -394,27 +382,15 @@
     <ClInclude Include="..\..\..\..\include\iosignal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\l_stdlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\include\lib_strbuf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\isc\mem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\netdb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -508,12 +484,6 @@
     <ClInclude Include="..\..\..\..\include\ntpd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\ondestroy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\recvbuff.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -523,27 +493,12 @@
     <ClInclude Include="..\..\include\sys\signal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stdtime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\syslog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\termios.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\sys\time.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -565,32 +520,80 @@
     <ClInclude Include="..\..\libntp\messages.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\md5.h">
+    <ClInclude Include="..\..\..\..\include\safecast.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h">
+    <ClInclude Include="..\..\..\..\include\libntp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netscope.h">
+    <ClInclude Include="..\..\..\..\include\libssl_compat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h">
+    <ClInclude Include="..\..\include\msvc_ssl_autolib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\buffer.h">
+      <Filter>libisc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\safecast.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\condition.h">
+      <Filter>libisc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\libntp.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\event.h">
+      <Filter>libisc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\libssl_compat.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\hash.h">
+      <Filter>libisc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\msvc_ssl_autolib.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\interfaceiter.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\ipv6.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\log.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\md5.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\mutex.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\net.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\netaddr.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\netscope.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\ondestroy.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\platform.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\socket.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\stat.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\stdtime.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\include\isc\task.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\thread.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\time.h">
+      <Filter>libisc Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\libntp\lib\isc\win32\include\isc\win32os.h">
+      <Filter>libisc Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/sntp/libopts/save.c b/sntp/libopts/save.c
index 8b1fba9d6..628c27a46 100644
--- a/sntp/libopts/save.c
+++ b/sntp/libopts/save.c
@@ -480,6 +480,30 @@ prt_nested(FILE * fp, tOptDesc * od, save_flags_mask_t save_fl)
     } while (--opt_ct > 0);
 }
 
+#ifdef _MSC_VER
+/**
+ * truncate() emulation for Microsoft C
+ *
+ * @param[in] fname  the save file name
+ * @param[in] newsz  new size of fname in octets
+ */
+static int
+truncate(char const* fname, size_t newsz)
+{
+    int fd;
+    int err;
+
+    fd = open(fname, O_RDWR);
+    if (fd < 0)
+            return fd;
+    err = _chsize_s(fd, newsz);
+    close(fd);
+    if (0 != err)
+            errno = err;
+    return err;
+}
+#endif /* _MSC_VER */
+
 /**
  * remove the current program settings
  *
diff --git a/sntp/libopts/text_mmap.c b/sntp/libopts/text_mmap.c
index 11093082e..ed5819271 100644
--- a/sntp/libopts/text_mmap.c
+++ b/sntp/libopts/text_mmap.c
@@ -187,7 +187,7 @@ validate_mmap(char const * fname, int prot, int flags, tmap_info_t * mapinfo)
          */
         int o_flag =
 #ifdef _WIN32
-            O_BINARY |
+            _O_BINARY |
 #endif
             FILE_WRITABLE(prot, flags) ? O_RDWR : O_RDONLY;