diff --git a/CHANGES b/CHANGES index ff6f4b3186..55bd96ed00 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +3844. [bug] Use the x64 version of the Microsoft Visual C++ + Redistributable when built for 64 bit Windows. + (Thanks to Giovanni Paterno.) [RT #35973] + 3843. [protocol] Check EDNS EXPIRE option in dns_rdata_fromwire. [RT #35969] diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index e231faf236..6270c45012 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -555,8 +555,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 {