* wincap.cc (wincapc::init): Revert previous change. It's not working.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5dd469362ee310ce57592ed099a4e87ab122bea8..8fa9089a35efe07ed7fa1694efb3a59efa8f5ea9 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-19  Corinna Vinschen  <corinna@vinschen.de>
+
+       * wincap.cc (wincapc::init): Revert previous change.  It's not working.
+
 2013-11-19  Corinna Vinschen  <corinna@vinschen.de>
 
        * net.cc (cygwin_getaddrinfo): Fix a comment.  Only memset whints if

diff --git a/winsup/cygwin/release/1.7.26 b/winsup/cygwin/release/1.7.26
index 962a8b9ecdae896f42d3a5fad54720232787916a..722606cd0a3a9e1dff4a52ca56287171def58003 100644 (file)
--- a/winsup/cygwin/release/1.7.26
+++ b/winsup/cygwin/release/1.7.26
@@ -22,10 +22,6 @@ What changed:
 - The header /usr/include/exceptions.h, containing implementation details for
   32 bit Windows' exception handling only, has been removed.
 
-- Against all odds, report correct OS kernel version number on Windows 8.1
-  and Windows Server 2012 R2.
-  See: http://cygwin.com/ml/cygwin/2013-11/msg00343.html
-
 
 Bug fixes:
 ----------

diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index 9a4708c3cb369f8a490dbe1e89067e470b345101..d84679df55197b2499918c6e0ae8d909938776d7 100644 (file)
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -197,15 +197,6 @@ wincapc::init ()
            case 1:
              caps = &wincap_7;
              break;
-           case 2:
-             /* Hack for Windows 8.1 and Server 2012R2:  If the executable is
-                missing a Windows 8.1 mainfest, the OS returns dwMinorVersion
-                2, as if it's running on Windows 8 or Server 2012.  The
-                correct dwMinorVersion is 3 for 8.1/2012R2, though, so we're
-                fixing this up here. */
-             if (version.dwBuildNumber >= 9200)
-               version.dwMinorVersion = 3;
-             /*FALLTHRU*/
            default:
              caps = &wincap_8;
              break;