ffi 1.10.0 → 1.13.1

data/lib/ffi/platform/x86_64-solaris/types.conf

@@ -1,122 +1,122 @@
-rbx.platform.typedef.lock_t = uchar
-rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.*caddr_t = char
+rbx.platform.typedef.blkcnt64_t = long
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.clock_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.cnt_t = short
+rbx.platform.typedef.cpu_flag_t = ushort
+rbx.platform.typedef.ctid_t = int
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.datalink_id_t = uint
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.diskaddr_t = ulong_long
+rbx.platform.typedef.disp_lock_t = uchar
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.fds_mask = long
+rbx.platform.typedef.fsblkcnt64_t = ulong
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt64_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.hrtime_t = long_long
+rbx.platform.typedef.id_t = int
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.index_t = short
+rbx.platform.typedef.ino64_t = ulong
+rbx.platform.typedef.ino_t = ulong
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.int64_t = long
-rbx.platform.typedef.uint8_t = uchar
-rbx.platform.typedef.uint16_t = ushort
-rbx.platform.typedef.uint32_t = uint
-rbx.platform.typedef.uint64_t = ulong
-rbx.platform.typedef.intmax_t = long
-rbx.platform.typedef.uintmax_t = ulong
-rbx.platform.typedef.intptr_t = long
-rbx.platform.typedef.uintptr_t = ulong
-rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int8_t = char
 rbx.platform.typedef.int_fast16_t = int
 rbx.platform.typedef.int_fast32_t = int
 rbx.platform.typedef.int_fast64_t = long
-rbx.platform.typedef.uint_fast8_t = uchar
-rbx.platform.typedef.uint_fast16_t = uint
-rbx.platform.typedef.uint_fast32_t = uint
-rbx.platform.typedef.uint_fast64_t = ulong
-rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.int_fast8_t = char
 rbx.platform.typedef.int_least16_t = short
 rbx.platform.typedef.int_least32_t = int
 rbx.platform.typedef.int_least64_t = long
-rbx.platform.typedef.uint_least8_t = uchar
-rbx.platform.typedef.uint_least16_t = ushort
-rbx.platform.typedef.uint_least32_t = uint
-rbx.platform.typedef.uint_least64_t = ulong
-rbx.platform.typedef.longlong_t = long_long
-rbx.platform.typedef.u_longlong_t = ulong_long
-rbx.platform.typedef.t_scalar_t = int
-rbx.platform.typedef.t_uscalar_t = uint
-rbx.platform.typedef.uchar_t = uchar
-rbx.platform.typedef.ushort_t = ushort
-rbx.platform.typedef.uint_t = uint
-rbx.platform.typedef.ulong_t = ulong
-rbx.platform.typedef.*caddr_t = char
-rbx.platform.typedef.daddr_t = long
-rbx.platform.typedef.cnt_t = short
-rbx.platform.typedef.ptrdiff_t = long
-rbx.platform.typedef.pfn_t = ulong
-rbx.platform.typedef.pgcnt_t = ulong
-rbx.platform.typedef.spgcnt_t = long
-rbx.platform.typedef.use_t = uchar
-rbx.platform.typedef.sysid_t = short
-rbx.platform.typedef.index_t = short
-rbx.platform.typedef.off_t = long
-rbx.platform.typedef.off64_t = long
-rbx.platform.typedef.ino_t = ulong
-rbx.platform.typedef.blkcnt_t = long
-rbx.platform.typedef.fsblkcnt_t = ulong
-rbx.platform.typedef.fsfilcnt_t = ulong
-rbx.platform.typedef.ino64_t = ulong
-rbx.platform.typedef.blkcnt64_t = long
-rbx.platform.typedef.fsblkcnt64_t = ulong
-rbx.platform.typedef.fsfilcnt64_t = ulong
-rbx.platform.typedef.blksize_t = int
-rbx.platform.typedef.pad64_t = long
-rbx.platform.typedef.upad64_t = ulong
-rbx.platform.typedef.offset_t = long_long
-rbx.platform.typedef.u_offset_t = ulong_long
-rbx.platform.typedef.len_t = ulong_long
-rbx.platform.typedef.diskaddr_t = ulong_long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.ipaddr_t = uint
 rbx.platform.typedef.k_fltset_t = uint
-rbx.platform.typedef.id_t = int
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.len_t = ulong_long
 rbx.platform.typedef.lgrp_id_t = int
-rbx.platform.typedef.useconds_t = uint
-rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.lock_t = uchar
+rbx.platform.typedef.longlong_t = long_long
 rbx.platform.typedef.major_t = uint
 rbx.platform.typedef.minor_t = uint
-rbx.platform.typedef.pri_t = short
-rbx.platform.typedef.cpu_flag_t = ushort
-rbx.platform.typedef.o_mode_t = ushort
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.model_t = uint
+rbx.platform.typedef.nfds_t = ulong
+rbx.platform.typedef.nlink_t = uint
 rbx.platform.typedef.o_dev_t = short
-rbx.platform.typedef.o_uid_t = ushort
 rbx.platform.typedef.o_gid_t = ushort
+rbx.platform.typedef.o_ino_t = ushort
+rbx.platform.typedef.o_mode_t = ushort
 rbx.platform.typedef.o_nlink_t = short
 rbx.platform.typedef.o_pid_t = short
-rbx.platform.typedef.o_ino_t = ushort
-rbx.platform.typedef.key_t = int
-rbx.platform.typedef.mode_t = uint
-rbx.platform.typedef.uid_t = uint
-rbx.platform.typedef.gid_t = uint
-rbx.platform.typedef.datalink_id_t = uint
-rbx.platform.typedef.taskid_t = int
-rbx.platform.typedef.projid_t = int
+rbx.platform.typedef.o_uid_t = ushort
+rbx.platform.typedef.off64_t = long
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.offset_t = long_long
+rbx.platform.typedef.pad64_t = long
+rbx.platform.typedef.pfn_t = ulong
+rbx.platform.typedef.pgcnt_t = ulong
+rbx.platform.typedef.pid_t = int
 rbx.platform.typedef.poolid_t = int
-rbx.platform.typedef.zoneid_t = int
-rbx.platform.typedef.ctid_t = int
-rbx.platform.typedef.pthread_t = uint
+rbx.platform.typedef.pri_t = short
+rbx.platform.typedef.projid_t = int
 rbx.platform.typedef.pthread_key_t = uint
-rbx.platform.typedef.dev_t = ulong
-rbx.platform.typedef.nlink_t = uint
-rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.pthread_t = uint
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.rlim64_t = ulong_long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sa_family_t = ushort
 rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.spgcnt_t = long
 rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.sysid_t = short
+rbx.platform.typedef.t_scalar_t = int
+rbx.platform.typedef.t_uscalar_t = uint
+rbx.platform.typedef.taskid_t = int
 rbx.platform.typedef.time_t = long
-rbx.platform.typedef.clock_t = long
-rbx.platform.typedef.clockid_t = int
 rbx.platform.typedef.timer_t = int
-rbx.platform.typedef.unchar = uchar
-rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.uint = uint
-rbx.platform.typedef.ulong = ulong
 rbx.platform.typedef.u_char = uchar
-rbx.platform.typedef.u_short = ushort
 rbx.platform.typedef.u_int = uint
 rbx.platform.typedef.u_long = ulong
-rbx.platform.typedef.hrtime_t = long_long
-rbx.platform.typedef.fd_mask = long
-rbx.platform.typedef.fds_mask = long
-rbx.platform.typedef.sa_family_t = ushort
-rbx.platform.typedef.socklen_t = uint
-rbx.platform.typedef.nfds_t = ulong
-rbx.platform.typedef.disp_lock_t = uchar
-rbx.platform.typedef.model_t = uint
-rbx.platform.typedef.in_port_t = ushort
-rbx.platform.typedef.in_addr_t = uint
-rbx.platform.typedef.ipaddr_t = uint
-rbx.platform.typedef.rlim_t = ulong
-rbx.platform.typedef.rlim64_t = ulong_long
+rbx.platform.typedef.u_longlong_t = ulong_long
+rbx.platform.typedef.u_offset_t = ulong_long
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uchar_t = uchar
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = uint
+rbx.platform.typedef.uint_fast32_t = uint
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uint_t = uint
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.ulong_t = ulong
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.upad64_t = ulong
+rbx.platform.typedef.use_t = uchar
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.ushort_t = ushort
+rbx.platform.typedef.zoneid_t = int

data/lib/ffi/platform/x86_64-windows/types.conf

@@ -1,120 +1,52 @@
-rbx.platform.typedef.__int8_t = char
-rbx.platform.typedef.__uint8_t = uchar
-rbx.platform.typedef.__int16_t = short
-rbx.platform.typedef.__uint16_t = ushort
-rbx.platform.typedef.__int_least16_t = short
-rbx.platform.typedef.__uint_least16_t = ushort
-rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__uint32_t = uint
-rbx.platform.typedef.__int_least32_t = int
-rbx.platform.typedef.__uint_least32_t = uint
-rbx.platform.typedef.__int64_t = long_long
-rbx.platform.typedef.__uint64_t = ulong_long
-rbx.platform.typedef._off_t = long
-rbx.platform.typedef.__dev_t = short
-rbx.platform.typedef.__uid_t = ushort
-rbx.platform.typedef.__gid_t = ushort
+rbx.platform.typedef.__time32_t = long
+rbx.platform.typedef.__time64_t = long_long
+rbx.platform.typedef._dev_t = uint
+rbx.platform.typedef._ino_t = ushort
+rbx.platform.typedef._mode_t = ushort
 rbx.platform.typedef._off64_t = long_long
-rbx.platform.typedef.fpos_t = long_long
-rbx.platform.typedef._fpos_t = long_long
-rbx.platform.typedef._fpos64_t = long_long
-rbx.platform.typedef._ssize_t = long_long
-rbx.platform.typedef.wchar_t = ushort
-rbx.platform.typedef.wint_t = uint
-rbx.platform.typedef.wctype_t = ushort
-rbx.platform.typedef.ptrdiff_t = long_long
-rbx.platform.typedef.size_t = ulong_long
-rbx.platform.typedef.__off_t = long
-rbx.platform.typedef.__pid_t = int
-rbx.platform.typedef.__loff_t = long_long
-rbx.platform.typedef.u_char = uchar
-rbx.platform.typedef.u_short = ushort
-rbx.platform.typedef.u_int = uint
-rbx.platform.typedef.u_long = ulong
-rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.uint = uint
-rbx.platform.typedef.ulong = ulong
-rbx.platform.typedef.clock_t = ulong
-rbx.platform.typedef.time_t = long_long
-rbx.platform.typedef.daddr_t = long
-rbx.platform.typedef.caddr_t = string
-rbx.platform.typedef.pid_t = int
-rbx.platform.typedef.ssize_t = int
-rbx.platform.typedef.nlink_t = ushort
-rbx.platform.typedef.fd_mask = long
-rbx.platform.typedef.clockid_t = ulong
-rbx.platform.typedef.timer_t = ulong
-rbx.platform.typedef.useconds_t = ulong
-rbx.platform.typedef.suseconds_t = long
-rbx.platform.typedef.int8_t = char
+rbx.platform.typedef._off_t = long
+rbx.platform.typedef._pid_t = long_long
+rbx.platform.typedef._sigset_t = ulong_long
+rbx.platform.typedef.dev_t = uint
+rbx.platform.typedef.errno_t = int
+rbx.platform.typedef.ino_t = ushort
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.int64_t = long_long
-rbx.platform.typedef.uint8_t = uchar
-rbx.platform.typedef.uint16_t = ushort
-rbx.platform.typedef.uint32_t = uint
-rbx.platform.typedef.uint64_t = ulong_long
-rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = short
+rbx.platform.typedef.int_fast32_t = int
+rbx.platform.typedef.int_fast64_t = long_long
+rbx.platform.typedef.int_fast8_t = char
 rbx.platform.typedef.int_least16_t = short
 rbx.platform.typedef.int_least32_t = int
 rbx.platform.typedef.int_least64_t = long_long
-rbx.platform.typedef.uint_least8_t = uchar
-rbx.platform.typedef.uint_least16_t = ushort
-rbx.platform.typedef.uint_least32_t = uint
-rbx.platform.typedef.uint_least64_t = ulong_long
-rbx.platform.typedef.int_fast8_t = char
-rbx.platform.typedef.int_fast16_t = int
-rbx.platform.typedef.int_fast32_t = int
-rbx.platform.typedef.int_fast64_t = long_long
-rbx.platform.typedef.uint_fast8_t = uchar
-rbx.platform.typedef.uint_fast16_t = uint
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long_long
+rbx.platform.typedef.intptr_t = long_long
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.off32_t = long
+rbx.platform.typedef.off64_t = long_long
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.pid_t = long_long
+rbx.platform.typedef.ptrdiff_t = long_long
+rbx.platform.typedef.rsize_t = ulong_long
+rbx.platform.typedef.size_t = ulong_long
+rbx.platform.typedef.ssize_t = long_long
+rbx.platform.typedef.time_t = long_long
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = ushort
 rbx.platform.typedef.uint_fast32_t = uint
 rbx.platform.typedef.uint_fast64_t = ulong_long
-rbx.platform.typedef.intptr_t = long_long
-rbx.platform.typedef.uintptr_t = ulong_long
-rbx.platform.typedef.intmax_t = long_long
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least64_t = ulong_long
+rbx.platform.typedef.uint_least8_t = uchar
 rbx.platform.typedef.uintmax_t = ulong_long
-rbx.platform.typedef.off_t = long_long
-rbx.platform.typedef.loff_t = long_long
-rbx.platform.typedef.__dev16_t = short
-rbx.platform.typedef.__dev32_t = ulong
-rbx.platform.typedef._dev_t = uint
-rbx.platform.typedef.dev_t = uint
-rbx.platform.typedef.blksize_t = long
-rbx.platform.typedef.__blkcnt32_t = long
-rbx.platform.typedef.__blkcnt64_t = long_long
-rbx.platform.typedef.blkcnt_t = long_long
-rbx.platform.typedef.fsblkcnt_t = ulong
-rbx.platform.typedef.fsfilcnt_t = ulong
-rbx.platform.typedef.__uid16_t = ushort
-rbx.platform.typedef.__uid32_t = ulong
-rbx.platform.typedef.uid_t = ulong
-rbx.platform.typedef.__gid16_t = ushort
-rbx.platform.typedef.__gid32_t = ulong
-rbx.platform.typedef.gid_t = ulong
-rbx.platform.typedef.__ino32_t = ulong
-rbx.platform.typedef.__ino64_t = ulong_long
-rbx.platform.typedef.ino_t = ushort
-rbx.platform.typedef._ino_t = ushort
-rbx.platform.typedef.id_t = ulong
-rbx.platform.typedef.key_t = long_long
-rbx.platform.typedef.vm_offset_t = ulong
-rbx.platform.typedef.vm_size_t = ulong
-rbx.platform.typedef.u_int8_t = uchar
-rbx.platform.typedef.u_int16_t = ushort
-rbx.platform.typedef.u_int32_t = uint
-rbx.platform.typedef.u_int64_t = ulong_long
-rbx.platform.typedef.register_t = int
-rbx.platform.typedef.*addr_t = char
-rbx.platform.typedef.socklen_t = int
-rbx.platform.typedef.sa_family_t = ushort
-rbx.platform.typedef.__ULong = ulong
-rbx.platform.typedef.sigset_t = ulong
-rbx.platform.typedef.sig_atomic_t = int
-rbx.platform.typedef.rlim_t = ulong
-rbx.platform.typedef._sigset_t = ulong_long
-rbx.platform.typedef.__time32_t = long
-rbx.platform.typedef.__time64_t = long_long
-rbx.platform.typedef.errno_t = int
-rbx.platform.typedef._mode_t = ushort
-rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.uintptr_t = ulong_long
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.wchar_t = ushort
+rbx.platform.typedef.wctype_t = ushort
+rbx.platform.typedef.wint_t = ushort

data/lib/ffi/pointer.rb

@@ -31,17 +31,24 @@
 #
 
 require 'ffi/platform'
+
+# NOTE: all method definitions in this file are conditional on
+# whether they are not already defined. This is needed because
+# some Ruby implementations (e.g., TruffleRuby) might already
+# provide these methods due to using FFI internally, and we
+# should not override them to avoid warnings.
+
 module FFI
   class Pointer
 
     # Pointer size
-    SIZE = Platform::ADDRESS_SIZE / 8
+    SIZE = Platform::ADDRESS_SIZE / 8 unless const_defined?(:SIZE)
 
     # Return the size of a pointer on the current platform, in bytes
     # @return [Numeric]
     def self.size
       SIZE
-    end
+    end unless respond_to?(:size)
 
     # @param [nil,Numeric] len length of string to return
     # @return [String]
@@ -49,12 +56,12 @@ module FFI
     # equivalent string if +len+ is not +nil+.
     def read_string(len=nil)
       if len
-        return '' if len == 0
+        return ''.b if len == 0
         get_bytes(0, len)
       else
         get_string(0)
       end
-    end
+    end unless method_defined?(:read_string)
 
     # @param [Numeric] len length of string to return
     # @return [String]
@@ -64,7 +71,7 @@ module FFI
     #  ptr.read_string(len)  # with len not nil
     def read_string_length(len)
       get_bytes(0, len)
-    end
+    end unless method_defined?(:read_string_length)
 
     # @return [String]
     # Read pointer's contents as a string.
@@ -73,7 +80,7 @@ module FFI
     #  ptr.read_string  # with no len
     def read_string_to_null
       get_string(0)
-    end
+    end unless method_defined?(:read_string_to_null)
 
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
@@ -84,7 +91,7 @@ module FFI
     #  ptr.write_string(str, len)   # with len not nil
     def write_string_length(str, len)
       put_bytes(0, str, 0, len)
-    end
+    end unless method_defined?(:write_string_length)
 
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
@@ -95,7 +102,7 @@ module FFI
       len = str.bytesize unless len
       # Write the string data without NUL termination
       put_bytes(0, str, 0, len)
-    end
+    end unless method_defined?(:write_string)
 
     # @param [Type] type type of data to read from pointer's contents
     # @param [Symbol] reader method to send to +self+ to read +type+
@@ -113,7 +120,7 @@ module FFI
         tmp += size unless j == length-1 # avoid OOB
       }
       ary
-    end
+    end unless method_defined?(:read_array_of_type)
 
     # @param [Type] type type of data to write to pointer's contents
     # @param [Symbol] writer method to send to +self+ to write +type+
@@ -129,12 +136,12 @@ module FFI
         self.send(writer, i * size, val)
       }
       self
-    end
+    end unless method_defined?(:write_array_of_type)
 
     # @return [self]
     def to_ptr
       self
-    end
+    end unless method_defined?(:to_ptr)
 
     # @param [Symbol,Type] type of data to read
     # @return [Object]
@@ -144,7 +151,7 @@ module FFI
     #  ptr.get(type, 0)
     def read(type)
       get(type, 0)
-    end
+    end unless method_defined?(:read)
 
     # @param [Symbol,Type] type of data to read
     # @param [Object] value to write
@@ -155,6 +162,6 @@ module FFI
     #  ptr.put(type, 0)
     def write(type, value)
       put(type, 0, value)
-    end
+    end unless method_defined?(:write)
   end
 end