From 2d909ca11f2d61171a9afca3ccca7e07db1e4527 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 9 May 2017 15:30:19 +0000 Subject: merge revision(s) 58359: [Backport #13439] fix RSTRUCT_LEN macro in public C API rb_struct_size returns an Integer VALUE, so it must be converted to a `long` for compatibility with previous Ruby C API versions. * ext/-test-/struct/len.c: new * test/-ext-/struct/test_len.rb: new * include/ruby/ruby.h (RSTRUCT_LEN): use NUM2LONG [ruby-core:80692] [Bug #13439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 4aa388849b..1491f24ecb 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1190,7 +1190,7 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); #define TypedData_Get_Struct(obj,type,data_type,sval) \ ((sval) = (type*)rb_check_typeddata((obj), (data_type))) -#define RSTRUCT_LEN(st) rb_struct_size(st) +#define RSTRUCT_LEN(st) NUM2LONG(rb_struct_size(st)) #define RSTRUCT_PTR(st) rb_struct_ptr(st) #define RSTRUCT_SET(st, idx, v) rb_struct_aset(st, INT2NUM(idx), (v)) #define RSTRUCT_GET(st, idx) rb_struct_aref(st, INT2NUM(idx)) -- cgit v1.2.3