kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 28300:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-06-12 16:37:21 +00:00
parent c09d54a46c
commit 6fcf972c20
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jun 13 01:37:08 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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@fsij.org>
* time.c (init_leap_second_info): check the result of

4
ext/fiddle/closure.c
View file

@ -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);

4
version.h
View file

@ -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"