mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Update uname implementation in posix-w32

Browse source 
* libguile/posix-w32.c (uname): Update to modern processors (ia64 and
  x86_64) and OS versions (Vista to Windows 10).  Delete trailing
  whitespace.
This commit is contained in:
Eli Zaretskii 2016-07-16 10:54:45 +02:00 • committed by Andy Wingo
parent da0ee4dc80
commit d87915f25d
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libguile/posix-w32.c
View file

@ -59,8 +59,21 @@ uname (struct utsname *uts)
strcpy (uts->sysname, "Windows NT3x"); /* NT3x */ strcpy (uts->sysname, "Windows NT3x"); /* NT3x */
else if (osver.dwMajorVersion == 5 && osver.dwMinorVersion < 1) else if (osver.dwMajorVersion == 5 && osver.dwMinorVersion < 1)
strcpy (uts->sysname, "Windows 2000"); /* 2k */ strcpy (uts->sysname, "Windows 2000"); /* 2k */
else if (osver.dwMajorVersion >= 5) else if (osver.dwMajorVersion < 6)
strcpy (uts->sysname, "Windows XP"); /* XP */ strcpy (uts->sysname, "Windows XP"); /* XP */
else if (osver.dwMajorVersion == 6)
{
if (osver.dwMinorVersion < 1)
strcpy (uts->sysname, "Windows Vista"); /* Vista */
else if (osver.dwMinorVersion < 2)
strcpy (uts->sysname, "Windows 7"); /* Windows 7 */
else if (osver.dwMinorVersion < 3)
strcpy (uts->sysname, "Windows 8"); /* Windows 8 */
else if (osver.dwMinorVersion < 4)
strcpy (uts->sysname, "Windows 8.1"); /* Windows 8.1 */
}
else if (osver.dwMajorVersion >= 10)
strcpy (uts->sysname, "Windows 10 or later"); /* Windows 10 and later */
os = WinNT; os = WinNT;
break; break;
@ -110,6 +123,9 @@ uname (struct utsname *uts)
case PROCESSOR_ARCHITECTURE_MIPS: case PROCESSOR_ARCHITECTURE_MIPS:
strcpy (uts->machine, "mips"); strcpy (uts->machine, "mips");
break; break;
case PROCESSOR_ARCHITECTURE_IA64:
strcpy (uts->machine, "ia64");
break;
case PROCESSOR_ARCHITECTURE_INTEL: case PROCESSOR_ARCHITECTURE_INTEL:
/* /*
* dwProcessorType is only valid in Win95 and Win98 and WinME * dwProcessorType is only valid in Win95 and Win98 and WinME
@ -139,6 +155,9 @@ uname (struct utsname *uts)
break; break;
} }
break; break;
case PROCESSOR_ARCHITECTURE_AMD64:
strcpy (uts->machine, "x86_64");
break;
default: default:
strcpy (uts->machine, "unknown"); strcpy (uts->machine, "unknown");
break; break;