ffi 1.13.1 → 1.15.5

data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c

@@ -4,7 +4,7 @@
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-/* { dg-do run } */
+/* { dg-do run { xfail gccbug } } */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1220,7 +1220,7 @@ void
   }
   fprintf(out,"->{%g}\n",Fr.x);
   fflush(out);
-#endif
+#endif  
 #if (!defined(DGTEST)) || DGTEST == 56  
   Dr = D_fDd(f1,D2,d3);
   fprintf(out,"->{%g}\n",Dr.x);
@@ -1243,7 +1243,7 @@ void
   }
   fprintf(out,"->{%g}\n",Dr.x);
   fflush(out);
-#endif
+#endif  
 #if (!defined(DGTEST)) || DGTEST == 57  
   Dr = D_Dfd(D1,f2,d3);
   fprintf(out,"->{%g}\n",Dr.x);

data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c

@@ -4,7 +4,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* { dg-do run } */
+/* { dg-do run { xfail gccbug } } */
 
 #include <stdio.h>
 #include <stdlib.h>

data/ext/ffi_c/libffi/testsuite/libffi.closures/huge_struct.c

@@ -9,6 +9,8 @@
 /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
 /* { dg-options -Wformat=0 { target moxie*-*-elf or1k-*-* } } */
 
+#include <inttypes.h>
+
 #include "ffitest.h"
 
 typedef	struct BigStruct{

data/ffi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
   end
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f =~ /^(bench|gen|libtest|nbproject|spec)/
+    f =~ /^(\.|bench|gen|libtest|nbproject|spec)/
   end
 
   # Add libffi git files
@@ -39,5 +39,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
 end

data/lib/ffi/abstract_memory.rb

@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2020 Lars Kanis
+#
+# This file is part of ruby-ffi.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the Ruby FFI project nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#
+
+
+module FFI
+  class AbstractMemory
+    LONG_MAX = FFI::Pointer.new(1).size
+    private_constant :LONG_MAX
+
+    # Return +true+ if +self+ has a size limit.
+    #
+    # @return [Boolean]
+    def size_limit?
+      size != LONG_MAX
+    end
+  end
+end

data/lib/ffi/autopointer.rb

@@ -117,7 +117,7 @@ module FFI
     end
 
     # @abstract Base class for {AutoPointer}'s releasers.
-    #  
+    #
     #  All subclasses of Releaser should define a +#release(ptr)+ method.
     # A releaser is an object in charge of release an {AutoPointer}.
     class Releaser

data/lib/ffi/ffi.rb

@@ -33,6 +33,7 @@ require 'ffi/data_converter'
 require 'ffi/types'
 require 'ffi/library'
 require 'ffi/errno'
+require 'ffi/abstract_memory'
 require 'ffi/pointer'
 require 'ffi/memorypointer'
 require 'ffi/struct'

data/lib/ffi/io.rb

@@ -29,7 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#
 
 module FFI
-  
+
   # This module implements a couple of class methods to play with IO.
   module IO
     # @param [Integer] fd file decriptor
@@ -42,12 +42,12 @@ module FFI
 
     # @param [#read] io io to read from
     # @param [AbstractMemory] buf destination for data read from +io+
-    # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+, 
+    # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+,
     #  read until end of file.
     # @return [Numeric] length really read, in bytes
     #
     # A version of IO#read that reads data from an IO and put then into a native buffer.
-    # 
+    #
     # This will be optimized at some future time to eliminate the double copy.
     #
     def self.native_read(io, buf, len)

data/lib/ffi/library.rb

@@ -84,7 +84,7 @@ module FFI
     # @raise {RuntimeError} if +mod+ is not a Module
     # Test if extended object is a Module. If not, raise RuntimeError.
     def self.extended(mod)
-      raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(Module)
+      raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(::Module)
     end
 
 
@@ -115,7 +115,7 @@ module FFI
             rescue Exception => ex
               ldscript = false
               if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)/
-                if File.read($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
+                if File.binread($1) =~ /(?:GROUP|INPUT) *\( *([^ \)]+)/
                   libname = $1
                   ldscript = true
                 end
@@ -126,7 +126,7 @@ module FFI
               else
                 # TODO better library lookup logic
                 unless libname.start_with?("/") || FFI::Platform.windows?
-                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/'].find do |pth|
+                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/', '/opt/homebrew/lib/'].find do |pth|
                     File.exist?(pth + libname)
                   end
                   if path

data/lib/ffi/managedstruct.rb

@@ -44,7 +44,7 @@ module FFI
   #    attach_function :new_dlist, [], :pointer
   #    attach_function :destroy_dlist, [:pointer], :void
   #  end
-  #  
+  #
   #  class DoublyLinkedList < FFI::ManagedStruct
   #    @@@
   #    struct do |s|
@@ -71,7 +71,7 @@ module FFI
 
     # @overload initialize(pointer)
     #  @param [Pointer] pointer
-    #  Create a new ManagedStruct which will invoke the class method #release on 
+    #  Create a new ManagedStruct which will invoke the class method #release on
     # @overload initialize
     # A new instance of FFI::ManagedStruct.
     def initialize(pointer=nil)

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

@@ -0,0 +1,130 @@
+rbx.platform.typedef.__darwin_blkcnt_t = long_long
+rbx.platform.typedef.__darwin_blksize_t = int
+rbx.platform.typedef.__darwin_clock_t = ulong
+rbx.platform.typedef.__darwin_ct_rune_t = int
+rbx.platform.typedef.__darwin_dev_t = int
+rbx.platform.typedef.__darwin_fsblkcnt_t = uint
+rbx.platform.typedef.__darwin_fsfilcnt_t = uint
+rbx.platform.typedef.__darwin_gid_t = uint
+rbx.platform.typedef.__darwin_id_t = uint
+rbx.platform.typedef.__darwin_ino64_t = ulong_long
+rbx.platform.typedef.__darwin_ino_t = ulong_long
+rbx.platform.typedef.__darwin_intptr_t = long
+rbx.platform.typedef.__darwin_mach_port_name_t = uint
+rbx.platform.typedef.__darwin_mach_port_t = uint
+rbx.platform.typedef.__darwin_mode_t = ushort
+rbx.platform.typedef.__darwin_natural_t = uint
+rbx.platform.typedef.__darwin_off_t = long_long
+rbx.platform.typedef.__darwin_pid_t = int
+rbx.platform.typedef.__darwin_pthread_key_t = ulong
+rbx.platform.typedef.__darwin_ptrdiff_t = long
+rbx.platform.typedef.__darwin_rune_t = int
+rbx.platform.typedef.__darwin_sigset_t = uint
+rbx.platform.typedef.__darwin_size_t = ulong
+rbx.platform.typedef.__darwin_socklen_t = uint
+rbx.platform.typedef.__darwin_ssize_t = long
+rbx.platform.typedef.__darwin_suseconds_t = int
+rbx.platform.typedef.__darwin_time_t = long
+rbx.platform.typedef.__darwin_uid_t = uint
+rbx.platform.typedef.__darwin_useconds_t = uint
+rbx.platform.typedef.__darwin_uuid_string_t[37] = char
+rbx.platform.typedef.__darwin_uuid_t[16] = uchar
+rbx.platform.typedef.__darwin_wchar_t = int
+rbx.platform.typedef.__darwin_wint_t = int
+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.__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.blkcnt_t = long_long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = ulong
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.errno_t = int
+rbx.platform.typedef.fd_mask = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = uint
+rbx.platform.typedef.fsfilcnt_t = uint
+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.ino64_t = ulong_long
+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 = 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.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.mode_t = ushort
+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
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.syscall_arg_t = ulong_long
+rbx.platform.typedef.time_t = long
+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 = 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
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.user_addr_t = ulong_long
+rbx.platform.typedef.user_long_t = long_long
+rbx.platform.typedef.user_off_t = long_long
+rbx.platform.typedef.user_size_t = ulong_long
+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/aarch64-freebsd/types.conf

@@ -39,9 +39,9 @@ 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 = int
+rbx.platform.typedef.__suseconds_t = long
 rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
+rbx.platform.typedef.__time_t = long
 rbx.platform.typedef.__timer_t = int
 rbx.platform.typedef.__uid_t = uint
 rbx.platform.typedef.__uint16_t = ushort

data/lib/ffi/platform/aarch64-freebsd12/types.conf

@@ -1,128 +1,181 @@
+rbx.platform.typedef.*) = pointer
+rbx.platform.typedef.___wchar_t = uint
+rbx.platform.typedef.__accmode_t = int
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__char16_t = ushort
+rbx.platform.typedef.__char32_t = uint
 rbx.platform.typedef.__clock_t = int
 rbx.platform.typedef.__clockid_t = int
-rbx.platform.typedef.__cpuid_t = ulong
-rbx.platform.typedef.__dev_t = ulong_long
-rbx.platform.typedef.__fd_mask = int
+rbx.platform.typedef.__cpulevel_t = int
+rbx.platform.typedef.__cpusetid_t = int
+rbx.platform.typedef.__cpuwhich_t = int
+rbx.platform.typedef.__critical_t = long
+rbx.platform.typedef.__ct_rune_t = int
+rbx.platform.typedef.__daddr_t = long
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__fd_mask = ulong
+rbx.platform.typedef.__fflags_t = uint
 rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
 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.__id_t = long
+rbx.platform.typedef.__ino_t = ulong
 rbx.platform.typedef.__int16_t = short
 rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int64_t = 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_fast64_t = 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_least64_t = long
 rbx.platform.typedef.__int_least8_t = char
-rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intfptr_t = long
+rbx.platform.typedef.__intmax_t = long
 rbx.platform.typedef.__intptr_t = long
 rbx.platform.typedef.__key_t = long
-rbx.platform.typedef.__mode_t = uint
-rbx.platform.typedef.__nlink_t = ulong_long
-rbx.platform.typedef.__off_t = long_long
-rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__lwpid_t = int
+rbx.platform.typedef.__mode_t = ushort
+rbx.platform.typedef.__nl_item = int
+rbx.platform.typedef.__nlink_t = ulong
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__off_t = long
 rbx.platform.typedef.__pid_t = int
-rbx.platform.typedef.__psize_t = ulong
 rbx.platform.typedef.__ptrdiff_t = long
-rbx.platform.typedef.__register_t = long_long
-rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__register_t = long
+rbx.platform.typedef.__rlim_t = long
+rbx.platform.typedef.__rman_res_t = ulong
 rbx.platform.typedef.__rune_t = int
 rbx.platform.typedef.__sa_family_t = uchar
-rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__segsz_t = long
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__suseconds_t = int
-rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
-rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__u_register_t = ulong
 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.__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_long
+rbx.platform.typedef.__uint_fast64_t = ulong
 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_least64_t = ulong
 rbx.platform.typedef.__uint_least8_t = uchar
-rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintfptr_t = ulong
+rbx.platform.typedef.__uintmax_t = ulong
 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.__vm_offset_t = ulong
+rbx.platform.typedef.__vm_paddr_t = ulong
+rbx.platform.typedef.__vm_size_t = ulong
 rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.accmode_t = int
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.c_caddr_t = pointer
 rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.cap_ioctl_t = ulong
 rbx.platform.typedef.clock_t = int
 rbx.platform.typedef.clockid_t = int
-rbx.platform.typedef.cpuid_t = ulong
-rbx.platform.typedef.daddr32_t = int
-rbx.platform.typedef.daddr64_t = long_long
-rbx.platform.typedef.daddr_t = int
-rbx.platform.typedef.dev_t = ulong_long
+rbx.platform.typedef.cpulevel_t = int
+rbx.platform.typedef.cpusetid_t = int
+rbx.platform.typedef.cpuwhich_t = int
+rbx.platform.typedef.critical_t = long
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.fd_mask = ulong
+rbx.platform.typedef.fflags_t = uint
 rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
 rbx.platform.typedef.gid_t = uint
-rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.id_t = long
 rbx.platform.typedef.in_addr_t = uint
 rbx.platform.typedef.in_port_t = ushort
-rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.ino_t = ulong
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
-rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int64_t = 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
+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
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
 rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = long
-rbx.platform.typedef.mode_t = uint
-rbx.platform.typedef.nlink_t = ulong_long
-rbx.platform.typedef.off_t = long_long
-rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.kpaddr_t = ulong
+rbx.platform.typedef.ksize_t = ulong
+rbx.platform.typedef.kssize_t = long
+rbx.platform.typedef.kvaddr_t = ulong
+rbx.platform.typedef.lwpid_t = int
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.nlink_t = ulong
+rbx.platform.typedef.off64_t = long
+rbx.platform.typedef.off_t = long
 rbx.platform.typedef.pid_t = int
-rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.pthread_key_t = int
+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.quad_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = long
+rbx.platform.typedef.rman_res_t = ulong
+rbx.platform.typedef.rsize_t = ulong
+rbx.platform.typedef.rune_t = int
 rbx.platform.typedef.sa_family_t = uchar
-rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.sbintime_t = long
+rbx.platform.typedef.segsz_t = long
 rbx.platform.typedef.size_t = ulong
 rbx.platform.typedef.socklen_t = uint
 rbx.platform.typedef.ssize_t = long
-rbx.platform.typedef.suseconds_t = int
-rbx.platform.typedef.swblk_t = int
-rbx.platform.typedef.time_t = int
-rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
 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_int64_t = ulong
 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_quad_t = ulong
+rbx.platform.typedef.u_register_t = ulong
 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.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 = uint
+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.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.vm_offset_t = ulong
+rbx.platform.typedef.vm_ooffset_t = ulong
+rbx.platform.typedef.vm_paddr_t = ulong
+rbx.platform.typedef.vm_pindex_t = ulong
+rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.wchar_t = uint