[setup] branch master, updated. release_2.873-11-g820dab9

[corinna@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=820dab935fc9282bab22fd2ead4bf1f2b6c788b8

commit 820dab935fc9282bab22fd2ead4bf1f2b6c788b8
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Jan 20 18:53:52 2016 +0100

    Drop Windows 2000 considerations from installer code
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>


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))