aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2001-09-12 21:07:13 +0000
committerCorinna Vinschen <corinna@vinschen.de>2001-09-12 21:07:13 +0000
commit4b081513cc35e310c3262b9276ad142b30cebf06 (patch)
treee0ed6bd775ef592add032b551234aaab8bc9d4bc /winsup
parent09dcaf6922eb20c2293726b5036df798c0174d3b (diff)
downloadnewlib-4b081513cc35e310c3262b9276ad142b30cebf06.zip
newlib-4b081513cc35e310c3262b9276ad142b30cebf06.tar.gz
newlib-4b081513cc35e310c3262b9276ad142b30cebf06.tar.bz2
* wincap.cc (wincapc::init): Simplify W2K/XP case.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/wincap.cc11
2 files changed, 7 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4bff310..368c0f4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 12 23:06:00 2001 Corinna Vinschen <corinna@vinschen.de>
+
+ * wincap.cc (wincapc::init): Simplify W2K/XP case.
+
Wed Sep 12 23:02:00 2001 Corinna Vinschen <corinna@vinschen.de>
* wincap.cc (wincapc::init): Set os name to "NT" on XP, too.
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index c4c4188..857af10 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -402,16 +402,11 @@ wincapc::init ()
caps = &wincap_nt4sp4;
break;
case 5:
+ os = "NT";
if (version.dwMinorVersion == 0)
- {
- os = "NT";
- caps = &wincap_2000;
- }
+ caps = &wincap_2000;
else
- {
- os = "NT";
- caps = &wincap_xp;
- }
+ caps = &wincap_xp;
break;
default:
os = "??";