From: Francis Dupont <fdupont@isc.org>
Date: Tue, 13 May 2014 10:31:50 +0000 (+0200)
Subject: use vcredist_x64.exe for 64 bit Windows [#35973]
X-Git-Tag: v9.11.0a1~1651
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=761f60fc356c9987258cd10b4aa216c6296d922b;p=thirdparty%2Fbind9.git

use vcredist_x64.exe for 64 bit Windows [#35973]
---

diff --git a/CHANGES b/CHANGES
index a85cfe1788a..e1da5219be4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3843.	[bug]		Use the x64 version of the Microsoft Visual C++
+			Redistributable when built for 64 bit Windows.
+			(Thanks to Giovanni Paterno.) [RT #35973]
+
 3842.	[bug]		Adjust RRL log-only logging category. [RT #35945]
 
 3841.	[cleanup]	Refactor zone.c:add_opt to use dns_message_buildopt.
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 72beddb0485..d51c225c4a6 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -563,8 +563,13 @@ void CBINDInstallDlg::OnInstall() {
 	 * Enclose full path to Vcredist_x86.exe in quotes as
 	 * m_currentDir may contain spaces.
 	 */
+#ifndef _WIN64
 	sprintf(Vcredist_x86, "\"%s\\Vcredist_x86.exe\"",
 		(LPCTSTR) m_currentDir);
+#else
+	sprintf(Vcredist_x86, "\"%s\\Vcredist_x64.exe\"",
+		(LPCTSTR) m_currentDir);
+#endif
 	system(Vcredist_x86);
 #endif
 	try {