naruse	2010-06-13 01:37:21 +0900 (Sun, 13 Jun 2010)

  New Revision: 28303

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28303

  Log:
    merge revision(s) 28300:
    
    * ext/fiddle/closure.c (dealloc): workaround fix for libffi's
      ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/fiddle/closure.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28302)
+++ ruby_1_9_2/ChangeLog	(revision 28303)
@@ -1,3 +1,8 @@
+Sun Jun 13 01:37:08 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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  <akr@f...>
 
 	* time.c (init_leap_second_info): check the result of
Index: ruby_1_9_2/ext/fiddle/closure.c
===================================================================
--- ruby_1_9_2/ext/fiddle/closure.c	(revision 28302)
+++ ruby_1_9_2/ext/fiddle/closure.c	(revision 28303)
@@ -14,11 +14,15 @@
 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);
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 28302)
+++ ruby_1_9_2/version.h	(revision 28303)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/