mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
header files. Thanks Yugui! [ruby-core:30917] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f6a93900dc
commit
50bb2544bb
2 changed files with 54 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Jun 29 01:22:08 2010 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||
|
||||
* ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
|
||||
header files. Thanks Yugui! [ruby-core:30917]
|
||||
|
||||
Mon Jun 28 22:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* test/rdoc/test_rdoc_ri_driver.rb (TestRDocRIDriver#test_formatter):
|
||||
|
|
|
@ -18,6 +18,55 @@
|
|||
#include <ffi.h>
|
||||
#endif
|
||||
|
||||
#undef ffi_type_uchar
|
||||
#undef ffi_type_schar
|
||||
#undef ffi_type_ushort
|
||||
#undef ffi_type_sshort
|
||||
#undef ffi_type_uint
|
||||
#undef ffi_type_sint
|
||||
#undef ffi_type_ulong
|
||||
#undef ffi_type_slong
|
||||
|
||||
#ifdef CHAR_BIT == 8
|
||||
# define ffi_type_uchar ffi_type_uint8
|
||||
# define ffi_type_schar ffi_type_sint8
|
||||
#else
|
||||
# error "CHAR_BIT not supported"
|
||||
#endif
|
||||
|
||||
# ifdef SIZEOF_SHORT == 2
|
||||
# define ffi_type_ushort ffi_type_uint16
|
||||
# define ffi_type_sshort ffi_type_sint16
|
||||
# elif SIZEOF_SHORT == 4
|
||||
# define ffi_type_ushort ffi_type_uint32
|
||||
# define ffi_type_sshort ffi_type_sint32
|
||||
# else
|
||||
# error "short size not supported"
|
||||
# endif
|
||||
|
||||
# if SIZEOF_INT == 2
|
||||
# define ffi_type_uint ffi_type_uint16
|
||||
# define ffi_type_sint ffi_type_sint16
|
||||
# elif SIZEOF_INT == 4
|
||||
# define ffi_type_uint ffi_type_uint32
|
||||
# define ffi_type_sint ffi_type_sint32
|
||||
# elif SIZEOF_INT == 8
|
||||
# define ffi_type_uint ffi_type_uint64
|
||||
# define ffi_type_sint ffi_type_sint64
|
||||
# else
|
||||
# error "int size not supported"
|
||||
# endif
|
||||
|
||||
# if SIZEOF_LONG == 4
|
||||
# define ffi_type_ulong ffi_type_uint32
|
||||
# define ffi_type_slong ffi_type_sint32
|
||||
# elif SIZEOF_LONG == 8
|
||||
# define ffi_type_ulong ffi_type_uint64
|
||||
# define ffi_type_slong ffi_type_sint64
|
||||
# else
|
||||
# error "long size not supported"
|
||||
# endif
|
||||
|
||||
#include <closure.h>
|
||||
#include <conversions.h>
|
||||
#include <function.h>
|
||||
|
|
Loading…
Reference in a new issue