Add workaround for "l!" on Windows

ruby · Oct 2, 2024 · b809583 · b809583
1 parent c688bea
commit b809583
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/lib/fiddle/pack.rb b/lib/fiddle/pack.rb
@@ -41,6 +41,12 @@ module PackInfo # :nodoc: all
     when SIZEOF_LONG
       PACK_MAP[TYPE_BOOL] = PACK_MAP[TYPE_ULONG]
     end
+    if RUBY_ENGINE == "jruby" and WINDOWS and [0].pack("l!").size == 8
+      # JRuby's 'l!' pack string doesn't use 32-bit on Windows.
+      # See https://github.com/jruby/jruby/issues/8357 for details
+      PACK_MAP[TYPE_LONG] = PACK_MAP[TYPE_INT]
+      PACK_MAP[TYPE_ULONG] = PACK_MAP[TYPE_UINT]
+    end
 
     SIZE_MAP = {
       TYPE_VOIDP => SIZEOF_VOIDP,

diff --git a/test/fiddle/test_c_struct_entry.rb b/test/fiddle/test_c_struct_entry.rb
@@ -49,11 +49,6 @@ def test_class_size_with_count
     end
 
     def test_set_ctypes
-      if RUBY_ENGINE == "jruby" and Fiddle::WINDOWS
-        omit("JRuby's 'l!' pack string is buggy. " +
-             "See https://github.com/jruby/jruby/issues/8357 for details")
-      end
-
       CStructEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |struct|
         struct.assign_names %w[int long]
 

diff --git a/test/fiddle/test_c_union_entity.rb b/test/fiddle/test_c_union_entity.rb
@@ -21,11 +21,6 @@ def test_class_size_with_count
     end
 
     def test_set_ctypes
-      if RUBY_ENGINE == "jruby" and Fiddle::WINDOWS
-        omit("JRuby's 'l!' pack string is buggy. " +
-             "See https://github.com/jruby/jruby/issues/8357 for details")
-      end
-
       CUnionEntity.malloc([TYPE_INT, TYPE_LONG], Fiddle::RUBY_FREE) do |union|
         union.assign_names %w[int long]