From 599dbf65a57ad7ce37a3dd23d3513ef2699eb9b2 Mon Sep 17 00:00:00 2001 From: tmm1 Date: Sun, 8 Dec 2013 23:07:43 +0000 Subject: [PATCH] vm.c: fix compile issue on 32bit freebsd git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- internal.h | 3 +++ vm.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal.h b/internal.h index 2b8176c28b..f21c1c40b5 100644 --- a/internal.h +++ b/internal.h @@ -252,10 +252,13 @@ struct rb_subclass_entry { #if defined(HAVE_LONG_LONG) typedef unsigned LONG_LONG rb_serial_t; +#define SERIALT2NUM ULL2NUM #elif defined(HAVE_UINT64_T) typedef uint64_t rb_serial_t; +#define SERIALT2NUM SIZET2NUM #else typedef unsigned long rb_serial_t; +#define SERIALT2NUM ULONG2NUM #endif struct rb_classext_struct { diff --git a/vm.c b/vm.c index 855cd164e1..6af1bf13d9 100644 --- a/vm.c +++ b/vm.c @@ -163,9 +163,9 @@ ruby_vm_stat(int argc, VALUE *argv, VALUE self) #define SET(name, attr) \ if (key == sym_##name) \ - return SIZET2NUM(attr); \ + return SERIALT2NUM(attr); \ else if (hash != Qnil) \ - rb_hash_aset(hash, sym_##name, SIZET2NUM(attr)); + rb_hash_aset(hash, sym_##name, SERIALT2NUM(attr)); SET(method_serial, ruby_vm_method_serial); SET(constant_serial, ruby_vm_constant_serial);