Fix various build failures on Windows (Courtesy of rockerinthelocker)

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 588e23dbb29277f3ae0d5ed56c252479ae47b700..5b8a2c9013ac9563672d2df1358c2a9fcd0a83e6 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -36,9 +36,6 @@
 #define ISC_PLATFORM_NEEDNTOP
 #define ISC_PLATFORM_NEEDPTON
 #define ISC_PLATFORM_HAVESOCKADDRSTORAGE
-#if _MSC_VER >= 1900
-#define ISC_PLATFORM_HAVETFO
-#endif
 
 #define ISC_PLATFORM_NEEDSTRSEP
 #define ISC_PLATFORM_NEEDSTRLCPY

diff --git a/win32utils/Configure b/win32utils/Configure
index e9f468054361d00f5c3845e68875ac6ee320042a..ff596b70fa0951d621b9d9b689119a70ef508fa1 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -1283,6 +1283,11 @@ if ($vcredist_path eq " --infer-- ") {
                                            "redist", "1033"));
     }
 
+    # 'VCToolsRedistDir' is available since Visual Studio 2017.
+    if ($ENV{"VCToolsRedistDir"}) {
+        push(@vcpaths, $ENV{"VCToolsRedistDir"});
+    }
+
     my $rfile;
     if ($want_win32 eq "yes") {
         $rfile = "vcredist_x86.exe";