* uname.cc (uname): Shorten "WOW64" to "WOW" to account for the new

	Windows 10 OS version "10.0" starting with preview build 9926.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ef1b2f1fb767d25ccb3f5d0233b691f89822c5c8..bb269e52e2e5802ff6fdb0147c6cdcb15844cd1f 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-24  Pierre A. Humblet <pierre@phumblet.no-ip.org>
+
+       * uname.cc (uname): Shorten "WOW64" to "WOW" to account for the new
+       Windows 10 OS version "10.0" starting with preview build 9926.
+
 2015-01-23  Pierre A. Humblet <pierre@phumblet.no-ip.org>
 
        * net.cc (cygwin_inet_pton): Declare.

diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index b586e6374cebe17b3cb781b139f5be5a3e7b4e6e..1aa7f7371782873a6509d5d9c537d000cad024fe 100644 (file)
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -1,7 +1,7 @@
 /* uname.cc
 
    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2013, 2014 Red Hat, Inc.
+   2006, 2007, 2008, 2013, 2014, 2015 Red Hat, Inc.
    Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
    Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com
 
@@ -32,7 +32,7 @@ uname (struct utsname *name)
       /* Add a hint to the sysname, that we're running under WOW64.  This might
         give an early clue if somebody encounters problems. */
       if (wincap.is_wow64 ())
-       strncat (name->sysname, "-WOW64",
+       strncat (name->sysname, "-WOW",
                 sizeof name->sysname - strlen (name->sysname) - 1);
 
       GetSystemInfo (&sysinfo);