Eliminate use of deprecated `GetVersionEx()` (2)

* Also for VS2015

diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 878c64c..b74023c 100644 (file)
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -1122,6 +1122,7 @@
     <ClInclude Include="Common\VersionInfo.h" />\r
     <ClInclude Include="VSSHelper.h" />\r
     <ClInclude Include="VssPromptDlg.h" />\r
+    <ClInclude Include="Win_VersionHelper.h" />\r
     <ClInclude Include="WMGotoDlg.h" />\r
     <ClInclude Include="diffutils\lib\cmpbuf.h" />\r
     <ClInclude Include="diffutils\config.h" />\r

diff --git a/Src/Merge.vs2015.vcxproj.filters b/Src/Merge.vs2015.vcxproj.filters
index c0fcb89..2264955 100644 (file)
--- a/Src/Merge.vs2015.vcxproj.filters
+++ b/Src/Merge.vs2015.vcxproj.filters
@@ -1449,6 +1449,9 @@
     <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
       <Filter>MergeTest</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="Win_VersionHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r