diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-11-19 20:37:27 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-11-19 20:37:27 +0000 |
| commit | 690d1333f5f3591baf9c790f080f54e7eff22597 (patch) | |
| tree | 4a11ef66b0442ccd4e6b6b94d590cccee7df3e3d | |
| parent | 3007afbca31f4cd179d8a90683e505fdec34bfbc (diff) | |
| download | cygnal-690d1333f5f3591baf9c790f080f54e7eff22597.tar.gz cygnal-690d1333f5f3591baf9c790f080f54e7eff22597.tar.bz2 cygnal-690d1333f5f3591baf9c790f080f54e7eff22597.zip | |
* wincap.cc (wincapc::init): Revert previous change. It's not working.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/release/1.7.26 | 4 | ||||
| -rw-r--r-- | winsup/cygwin/wincap.cc | 9 |
3 files changed, 4 insertions, 13 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5dd469362..8fa9089a3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 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 hints is NULL. Add a comment and set whints.ai_family explicitely to AF_UNSPEC to follow glibc man page closely. Check flags against whints diff --git a/winsup/cygwin/release/1.7.26 b/winsup/cygwin/release/1.7.26 index 962a8b9ec..722606cd0 100644 --- 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 9a4708c3c..d84679df5 100644 --- 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; |