JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* uname.cc (uname): Drop unused code.

Browse Source
This commit is contained in:
Corinna Vinschen
2013-07-11 11:20:38 +00:00
parent 41f9a410cc
commit 3b2560e500
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,7 @@
2013-07-11 Corinna Vinschen <corinna@vinschen.de>
* uname.cc (uname): Drop unused code.
2013-07-10 Christopher Faylor <me.cygwin2013@cgf.cx> 2013-07-10 Christopher Faylor <me.cygwin2013@cgf.cx>
* gentlsoffsets: Clean up a little. * gentlsoffsets: Clean up a little.

17
winsup/cygwin/uname.cc
View File

@@ -1,7 +1,7 @@
/* uname.cc /* uname.cc
Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008 Red Hat, Inc. 2006, 2007, 2008, 2013 Red Hat, Inc.
Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com
@@ -31,21 +31,12 @@ uname (struct utsname *name)
memset (name, 0, sizeof (*name)); memset (name, 0, sizeof (*name));
__small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ()); __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
#if 0 /* Add a hint to the sysname, that we're running under WOW64. This might
/* Recognition of the real 64 bit CPU inside of a WOW64 system, irritates give an early clue if somebody encounters problems. */
build systems which think the native system is a 64 bit system. Since
we're actually running in a 32 bit environment, it looks more correct
just to use the CPU info given by WOW64. */
if (wincap.is_wow64 ())
GetNativeSystemInfo (&sysinfo);
else
#else
/* But it seems ok to 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 ()) if (wincap.is_wow64 ())
strncat (name->sysname, "-WOW64", strncat (name->sysname, "-WOW64",
sizeof name->sysname - strlen (name->sysname) - 1); sizeof name->sysname - strlen (name->sysname) - 1);
#endif
GetSystemInfo (&sysinfo); GetSystemInfo (&sysinfo);
/* Computer name */ /* Computer name */