ffi 1.12.2 → 1.13.0

data/lib/ffi/platform/sparcv9-openbsd/types.conf

@@ -0,0 +1,156 @@
+rbx.platform.typedef.__blkcnt_t = long_long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__clock_t = long_long
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__cpuid_t = ulong
+rbx.platform.typedef.__dev_t = int
+rbx.platform.typedef.__fd_mask = uint
+rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong_long
+rbx.platform.typedef.__fsfilcnt_t = ulong_long
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__in_addr_t = uint
+rbx.platform.typedef.__in_port_t = ushort
+rbx.platform.typedef.__ino_t = ulong_long
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long_long
+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_long
+rbx.platform.typedef.__int_fast8_t = int
+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.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__off_t = long_long
+rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__psize_t = ulong
+rbx.platform.typedef.__ptrdiff_t = long
+rbx.platform.typedef.__register_t = long
+rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__rune_t = int
+rbx.platform.typedef.__sa_family_t = uchar
+rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__size_t = ulong
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__swblk_t = int
+rbx.platform.typedef.__time_t = long_long
+rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong_long
+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_long
+rbx.platform.typedef.__uint_fast8_t = uint
+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.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintptr_t = ulong
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.__vaddr_t = ulong
+rbx.platform.typedef.__vsize_t = ulong
+rbx.platform.typedef.__wchar_t = int
+rbx.platform.typedef.__wctrans_t = pointer
+rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.blkcnt_t = long_long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = long_long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.cpuid_t = ulong
+rbx.platform.typedef.daddr32_t = int
+rbx.platform.typedef.daddr_t = long_long
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = ulong_long
+rbx.platform.typedef.fsfilcnt_t = ulong_long
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+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_long
+rbx.platform.typedef.int_fast8_t = int
+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.int_least8_t = char
+rbx.platform.typedef.intmax_t = long_long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.key_t = long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.sigset_t = uint
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.time_t = long_long
+rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+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.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.u_short = ushort
+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_long
+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_long
+rbx.platform.typedef.uint_fast8_t = uint
+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.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong_long
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.vaddr_t = ulong
+rbx.platform.typedef.vsize_t = ulong
+rbx.platform.typedef.wchar_t = int
+rbx.platform.typedef.wint_t = int

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

@@ -76,12 +76,15 @@ rbx.platform.typedef.nlink_t = ushort
 rbx.platform.typedef.off_t = long_long
 rbx.platform.typedef.pid_t = int
 rbx.platform.typedef.pthread_key_t = ulong
+rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.qaddr_t = pointer
 rbx.platform.typedef.quad_t = long_long
 rbx.platform.typedef.register_t = long_long
 rbx.platform.typedef.rlim_t = ulong_long
 rbx.platform.typedef.rsize_t = ulong
 rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.sae_associd_t = uint
+rbx.platform.typedef.sae_connid_t = uint
 rbx.platform.typedef.segsz_t = int
 rbx.platform.typedef.size_t = ulong
 rbx.platform.typedef.socklen_t = uint
@@ -124,3 +127,4 @@ rbx.platform.typedef.user_ssize_t = long_long
 rbx.platform.typedef.user_time_t = long_long
 rbx.platform.typedef.user_ulong_t = ulong_long
 rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.wchar_t = int

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

@@ -73,6 +73,15 @@ rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.int64_t = long
 rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = long
+rbx.platform.typedef.int_fast32_t = long
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = int
 rbx.platform.typedef.loff_t = long
 rbx.platform.typedef.mode_t = uint
@@ -82,6 +91,7 @@ rbx.platform.typedef.pid_t = int
 rbx.platform.typedef.pthread_key_t = uint
 rbx.platform.typedef.pthread_once_t = int
 rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.quad_t = long
 rbx.platform.typedef.register_t = long
 rbx.platform.typedef.rlim_t = ulong
@@ -107,5 +117,16 @@ 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 = ulong
+rbx.platform.typedef.uint_fast32_t = ulong
+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.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
 rbx.platform.typedef.ulong = ulong
 rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.wchar_t = int

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

@@ -1,64 +1,20 @@
-rbx.platform.typedef.*addr_t = char
-rbx.platform.typedef.__ULong = ulong
-rbx.platform.typedef.__blkcnt32_t = long
-rbx.platform.typedef.__blkcnt64_t = long_long
-rbx.platform.typedef.__dev16_t = short
-rbx.platform.typedef.__dev32_t = ulong
-rbx.platform.typedef.__dev_t = short
-rbx.platform.typedef.__gid16_t = ushort
-rbx.platform.typedef.__gid32_t = ulong
-rbx.platform.typedef.__gid_t = ushort
-rbx.platform.typedef.__ino32_t = ulong
-rbx.platform.typedef.__ino64_t = ulong_long
-rbx.platform.typedef.__int16_t = short
-rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__int64_t = long_long
-rbx.platform.typedef.__int8_t = char
-rbx.platform.typedef.__int_least16_t = short
-rbx.platform.typedef.__int_least32_t = int
-rbx.platform.typedef.__loff_t = long_long
-rbx.platform.typedef.__off_t = long
-rbx.platform.typedef.__pid_t = int
 rbx.platform.typedef.__time32_t = long
 rbx.platform.typedef.__time64_t = long_long
-rbx.platform.typedef.__uid16_t = ushort
-rbx.platform.typedef.__uid32_t = ulong
-rbx.platform.typedef.__uid_t = ushort
-rbx.platform.typedef.__uint16_t = ushort
-rbx.platform.typedef.__uint32_t = uint
-rbx.platform.typedef.__uint64_t = ulong_long
-rbx.platform.typedef.__uint8_t = uchar
-rbx.platform.typedef.__uint_least16_t = ushort
-rbx.platform.typedef.__uint_least32_t = uint
 rbx.platform.typedef._dev_t = uint
-rbx.platform.typedef._fpos64_t = long_long
-rbx.platform.typedef._fpos_t = long_long
 rbx.platform.typedef._ino_t = ushort
 rbx.platform.typedef._mode_t = ushort
 rbx.platform.typedef._off64_t = long_long
 rbx.platform.typedef._off_t = long
+rbx.platform.typedef._pid_t = long_long
 rbx.platform.typedef._sigset_t = ulong_long
-rbx.platform.typedef._ssize_t = long_long
-rbx.platform.typedef.blkcnt_t = long_long
-rbx.platform.typedef.blksize_t = long
-rbx.platform.typedef.caddr_t = string
-rbx.platform.typedef.clock_t = ulong
-rbx.platform.typedef.clockid_t = ulong
-rbx.platform.typedef.daddr_t = long
 rbx.platform.typedef.dev_t = uint
 rbx.platform.typedef.errno_t = int
-rbx.platform.typedef.fd_mask = long
-rbx.platform.typedef.fpos_t = long_long
-rbx.platform.typedef.fsblkcnt_t = ulong
-rbx.platform.typedef.fsfilcnt_t = ulong
-rbx.platform.typedef.gid_t = ulong
-rbx.platform.typedef.id_t = ulong
 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.int8_t = char
-rbx.platform.typedef.int_fast16_t = int
+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
@@ -68,53 +24,29 @@ rbx.platform.typedef.int_least64_t = long_long
 rbx.platform.typedef.int_least8_t = char
 rbx.platform.typedef.intmax_t = long_long
 rbx.platform.typedef.intptr_t = long_long
-rbx.platform.typedef.key_t = long_long
-rbx.platform.typedef.loff_t = long_long
 rbx.platform.typedef.mode_t = ushort
-rbx.platform.typedef.nlink_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 = int
+rbx.platform.typedef.pid_t = long_long
 rbx.platform.typedef.ptrdiff_t = long_long
-rbx.platform.typedef.register_t = int
-rbx.platform.typedef.rlim_t = ulong
-rbx.platform.typedef.sa_family_t = ushort
-rbx.platform.typedef.sig_atomic_t = int
-rbx.platform.typedef.sigset_t = ulong
+rbx.platform.typedef.rsize_t = ulong_long
 rbx.platform.typedef.size_t = ulong_long
-rbx.platform.typedef.socklen_t = int
-rbx.platform.typedef.ssize_t = int
-rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.ssize_t = long_long
 rbx.platform.typedef.time_t = long_long
-rbx.platform.typedef.timer_t = ulong
-rbx.platform.typedef.u_char = uchar
-rbx.platform.typedef.u_int = uint
-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.u_int8_t = uchar
-rbx.platform.typedef.u_long = ulong
-rbx.platform.typedef.u_short = ushort
-rbx.platform.typedef.uid_t = ulong
-rbx.platform.typedef.uint = uint
 rbx.platform.typedef.uint16_t = ushort
-rbx.platform.typedef.uint32_t = uint
 rbx.platform.typedef.uint64_t = ulong_long
 rbx.platform.typedef.uint8_t = uchar
-rbx.platform.typedef.uint_fast16_t = uint
+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.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_long
 rbx.platform.typedef.uint_least8_t = uchar
 rbx.platform.typedef.uintmax_t = ulong_long
 rbx.platform.typedef.uintptr_t = ulong_long
-rbx.platform.typedef.ulong = ulong
-rbx.platform.typedef.useconds_t = ulong
-rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.vm_offset_t = ulong
-rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.useconds_t = uint
 rbx.platform.typedef.wchar_t = ushort
 rbx.platform.typedef.wctype_t = ushort
-rbx.platform.typedef.wint_t = uint
+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]
@@ -54,7 +61,7 @@ module FFI
       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