From 3c24bea4b5bfa33b3dddde688638cc2892f9512c Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 12 Oct 2010 14:09:27 +0000 Subject: [PATCH] * gc.c (obj_free, rb_objspace_call_finalizer): fix truncating cast. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- gc.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5eac303039..e6c5b83a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Tue Oct 12 23:03:20 2010 Nobuyoshi Nakada +Tue Oct 12 23:09:24 2010 Nobuyoshi Nakada + + * gc.c (obj_free, rb_objspace_call_finalizer): fix truncating + cast. * gc.c (mark_current_machine_context): suppress warnings. diff --git a/gc.c b/gc.c index f4ee76d365..b7343fb420 100644 --- a/gc.c +++ b/gc.c @@ -2190,7 +2190,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj) if (RTYPEDDATA_P(obj)) { RDATA(obj)->dfree = RANY(obj)->as.typeddata.type->function.dfree; } - if ((long)RANY(obj)->as.data.dfree == -1) { + if (RANY(obj)->as.data.dfree == (RUBY_DATA_FUNC)-1) { xfree(DATA_PTR(obj)); } else if (RANY(obj)->as.data.dfree) { @@ -2908,7 +2908,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace) if (RTYPEDDATA_P(p)) { RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree; } - if ((long)RANY(p)->as.data.dfree == -1) { + if (RANY(p)->as.data.dfree == (RUBY_DATA_FUNC)-1) { xfree(DATA_PTR(p)); } else if (RANY(p)->as.data.dfree) {