archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 38073,38251,38252: [Backport #7552]

Browse source 
* ext/fiddle/extconf.rb, ext/fiddle/function.c
	  (Fiddle::Function::STDCALL): FFI_STDCALL is not a macro, but an
	  enumeration. [ruby-core:50398] [Bug #7483]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-12-20 09:45:19 +00:00
parent 449bf5f93d
commit 3912b7f29d
5 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/fiddle/function.c
View file

@ -179,7 +179,7 @@ Init_fiddle_function(void)
*/
rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
#ifdef FFI_STDCALL
#ifdef HAVE_CONST_FFI_STDCALL
/*
* Document-const: STDCALL
*
@ -203,7 +203,7 @@ Init_fiddle_function(void)
/*
* Document-method: new
* call-seq: new(ptr, *args, ret_type, abi = DEFAULT)
* call-seq: new(ptr, args, ret_type, abi = DEFAULT)
*
* Constructs a Function object.
* * +ptr+ is a referenced function, of a DL::Handle