From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14166 invoked by alias); 20 Jan 2016 17:53:59 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 14147 invoked by uid 9078); 20 Jan 2016 17:53:59 -0000 Date: Wed, 20 Jan 2016 17:53:00 -0000 Message-ID: <20160120175359.14120.qmail@sourceware.org> From: corinna@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.873-11-g820dab9 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1f7ba4b6f214486f3491f350b205e25ab33804d1 X-Git-Newrev: 820dab935fc9282bab22fd2ead4bf1f2b6c788b8 X-SW-Source: 2016-q1/txt/msg00005.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=820dab935fc9282bab22fd2ead4bf1f2b6c788b8 commit 820dab935fc9282bab22fd2ead4bf1f2b6c788b8 Author: Corinna Vinschen Date: Wed Jan 20 18:53:52 2016 +0100 Drop Windows 2000 considerations from installer code Signed-off-by: Corinna Vinschen Diff: --- install.cc | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/install.cc b/install.cc index e025485..2b714bc 100644 --- a/install.cc +++ b/install.cc @@ -337,20 +337,9 @@ Installer::extract_replace_on_reboot (archive *tarstream, const std::string& pre WCHAR sname[s.size () + 7]; WCHAR dname[d.size () + 7]; - /* Windows 2000 has a bug: Prepending \\?\ does not - * work in conjunction with MOVEFILE_DELAY_UNTIL_REBOOT. - * So in case of Windows 2000 we just convert the path - * to wide char and hope for the best. */ - if (OSMajorVersion () == 5 && OSMinorVersion () == 0) - { - mbstowcs (sname, s.c_str (), s.size () + 7); - mbstowcs (dname, d.c_str (), d.size () + 7); - } - else - { - mklongpath (sname, s.c_str (), s.size () + 7); - mklongpath (dname, d.c_str (), d.size () + 7); - } + + mklongpath (sname, s.c_str (), s.size () + 7); + mklongpath (dname, d.c_str (), d.size () + 7); if (!MoveFileExW (sname, dname, MOVEFILE_DELAY_UNTIL_REBOOT | MOVEFILE_REPLACE_EXISTING))