diff --git a/ChangeLog b/ChangeLog index fe3876feee..795ae613b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 13 01:37:08 2010 NARUSE, Yui + + * ext/fiddle/closure.c (dealloc): workaround fix for libffi's + ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214] + Fri Jun 11 23:21:35 2010 Tanaka Akira * time.c (init_leap_second_info): check the result of diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c index 2531ef2b48..3dc8eda013 100644 --- a/ext/fiddle/closure.c +++ b/ext/fiddle/closure.c @@ -14,11 +14,15 @@ static void dealloc(void * ptr) { fiddle_closure * cls = (fiddle_closure *)ptr; + /* #ifndef MACOSX ffi_closure_free(cls->pcl); #else + */ munmap(cls->pcl, sizeof(cls->pcl)); + /* #endif + */ xfree(cls->cif); if (cls->argv) xfree(cls->argv); xfree(cls); diff --git a/version.h b/version.h index cfe8701354..5113c6aaf8 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-06-12" +#define RUBY_RELEASE_DATE "2010-06-13" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h"