Skip to content

Etc.uname: Return "ARM64" on Windows ARM64 and drop Win9x branches #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 2 commits into from
Sep 25, 2026
Merged

Etc.uname: Return "ARM64" on Windows ARM64 and drop Win9x branches #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1ace4
Etc.uname: Return "ARM64" as the machine on Windows ARM64
hsbt Sep 25, 2026
1d39001
Etc.uname: Remove Win32s and Win9x branches
hsbt Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions ext/etc/etc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,18 +813,7 @@ etc_uname(VALUE obj)
rb_sys_fail("GetVersionEx");

result = rb_hash_new();
switch (v.dwPlatformId) {
case VER_PLATFORM_WIN32s:
sysname = "Win32s";
break;
case VER_PLATFORM_WIN32_NT:
sysname = "Windows_NT";
break;
case VER_PLATFORM_WIN32_WINDOWS:
default:
sysname = "Windows";
break;
}
sysname = "Windows_NT";
rb_hash_aset(result, SYMBOL_LIT("sysname"), rb_str_new_cstr(sysname));
release = rb_sprintf("%lu.%lu.%lu", v.dwMajorVersion, v.dwMinorVersion, v.dwBuildNumber);
rb_hash_aset(result, SYMBOL_LIT("release"), release);
Expand All @@ -847,6 +836,9 @@ etc_uname(VALUE obj)
# endif
# ifndef PROCESSOR_ARCHITECTURE_INTEL
# define PROCESSOR_ARCHITECTURE_INTEL 0
# endif
# ifndef PROCESSOR_ARCHITECTURE_ARM64
# define PROCESSOR_ARCHITECTURE_ARM64 12
# endif
GetSystemInfo(&s);
switch (s.wProcessorArchitecture) {
Expand All @@ -856,6 +848,9 @@ etc_uname(VALUE obj)
case PROCESSOR_ARCHITECTURE_ARM:
mach = "ARM";
break;
case PROCESSOR_ARCHITECTURE_ARM64:
mach = "ARM64";
break;
case PROCESSOR_ARCHITECTURE_INTEL:
mach = "x86";
break;
Expand Down
Loading