ruby-changes:66455
From: Nobuyoshi <ko1@a...>
Date: Wed, 9 Jun 2021 18:52:16 +0900 (JST)
Subject: [ruby-changes:66455] 9ba335e2eb (master): [Win32] fixed PACKED_STRUCT_UNALIGNED on x86
https://git.ruby-lang.org/ruby.git/commit/?id=9ba335e2eb From 9ba335e2eb79b1a75166828f437b71a1398ec3c5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Wed, 9 Jun 2021 18:49:14 +0900 Subject: [Win32] fixed PACKED_STRUCT_UNALIGNED on x86 Use MACHINE for x86 CPU family, ARCH is CPU model name (i386) and cannot be x86. --- win32/Makefile.sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c88ae6f..1d77b74 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -700,7 +700,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L700 !else #define PACKED_STRUCT(x) x !endif -!if "$(ARCH)" == "x86" || "$(ARCH)" == "x64" +!if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" #define PACKED_STRUCT_UNALIGNED(x) PACKED_STRUCT(x) !else #define PACKED_STRUCT_UNALIGNED(x) x -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/