summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-11 03:12:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-11 03:12:11 +0000
commit979da2675aff52b9b1ef79c2caca96f8dccbf251 (patch)
treec49e417383c755b7576e9cdd79d03b6a0827fa3c
parent5a36a6a7582eb460a73b05590f788f8a3e26d3da (diff)
* gc.c (run_final): calls free function. [ruby-core:22578]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c5
-rw-r--r--version.h6
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c17dbc594a..373c794e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 11 12:12:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (run_final): calls free function. [ruby-core:22578]
+
Mon Mar 9 22:57:47 2009 Akinori MUSHA <knu@iDaemons.org>
* version.h (RUBY_VERSION): Bump the version number to 1.8.8dev.
diff --git a/gc.c b/gc.c
index 98de8b70f6..1be3bc877a 100644
--- a/gc.c
+++ b/gc.c
@@ -1259,7 +1259,7 @@ make_io_deferred(RVALUE *p)
{
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 @@ run_final(obj)
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++) {
diff --git a/version.h b/version.h
index 47d0e5ddb0..16b8279de4 100644
--- a/version.h
+++ b/version.h
@@ -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[];