ruby-changes:11271
From: nobu <ko1@a...>
Date: Wed, 11 Mar 2009 12:12:21 +0900 (JST)
Subject: [ruby-changes:11271] Ruby:r22882 (ruby_1_8): * gc.c (run_final): calls free function.
nobu 2009-03-11 12:12:11 +0900 (Wed, 11 Mar 2009) New Revision: 22882 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22882 Log: * gc.c (run_final): calls free function. [ruby-core:22578] Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/gc.c branches/ruby_1_8/version.h Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 22881) +++ ruby_1_8/ChangeLog (revision 22882) @@ -1,3 +1,7 @@ +Wed Mar 11 12:12:08 2009 Nobuyoshi Nakada <nobu@r...> + + * gc.c (run_final): calls free function. [ruby-core:22578] + Mon Mar 9 22:57:47 2009 Akinori MUSHA <knu@i...> * version.h (RUBY_VERSION): Bump the version number to 1.8.8dev. Index: ruby_1_8/version.h =================================================================== --- ruby_1_8/version.h (revision 22881) +++ ruby_1_8/version.h (revision 22882) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-03-09" +#define RUBY_RELEASE_DATE "2009-03-11" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090309 +#define RUBY_RELEASE_CODE 20090311 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 11 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8/gc.c =================================================================== --- ruby_1_8/gc.c (revision 22881) +++ ruby_1_8/gc.c (revision 22882) @@ -1259,7 +1259,7 @@ { struct rb_io_t *fptr = p->as.file.fptr; make_deferred(p); - p->as.data.dfree = (void (*)(void*))rb_io_fptr_finalize; + p->as.data.dfree = (void (*)_((void*)))rb_io_fptr_finalize; p->as.data.data = fptr; } @@ -1960,6 +1960,9 @@ objid = rb_obj_id(obj); /* make obj into id */ RBASIC(obj)->klass = 0; rb_thread_critical = Qtrue; + if (RDATA(obj)->dfree) { + (*RDATA(obj)->dfree)(DATA_PTR(obj)); + } args[1] = 0; args[2] = (VALUE)ruby_safe_level; for (i=0; i<RARRAY(finalizers)->len; i++) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/