ffi 1.11.1-x64-mingw32 → 1.11.2-x64-mingw32

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

@@ -1,120 +1,120 @@
-rbx.platform.typedef.__int8_t = char
-rbx.platform.typedef.__uint8_t = uchar
+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.__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.__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.__gid_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.__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._sigset_t = ulong_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.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.time_t = long_long
+rbx.platform.typedef.clockid_t = ulong
 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.dev_t = uint
+rbx.platform.typedef.errno_t = int
 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.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.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.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.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.uint_fast8_t = uchar
+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_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.off_t = long_long
+rbx.platform.typedef.pid_t = int
+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.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.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_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_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.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.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.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.wchar_t = ushort
+rbx.platform.typedef.wctype_t = ushort
+rbx.platform.typedef.wint_t = uint

data/lib/ffi/tools/types_generator.rb

@@ -50,6 +50,7 @@ module FFI
 #include <sys/types.h>
 #if !(defined(WIN32))
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <sys/resource.h>
 #endif
         C
@@ -66,7 +67,7 @@ module FFI
         end
       end
 
-      code = ""
+      code = []
 
       typedefs.each_line do |type|
         # We only care about single line typedef
@@ -116,18 +117,18 @@ module FFI
         end
 
         if type = TYPE_MAP[def_type]
-          code << "rbx.platform.typedef.#{final_type} = #{type}\n"
+          code << "rbx.platform.typedef.#{final_type} = #{type}"
           TYPE_MAP[final_type] = TYPE_MAP[def_type]
         else
           # Fallback to an ordinary pointer if we don't know the type
           if def_type =~ /\*/
-            code << "rbx.platform.typedef.#{final_type} = pointer\n"
+            code << "rbx.platform.typedef.#{final_type} = pointer"
             TYPE_MAP[final_type] = :pointer
           end
         end
       end
 
-      code
+      code.sort.join("\n")
     end
   end
 end

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.11.1'
+  VERSION = '1.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: x64-mingw32
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,6 +86,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".appveyor.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
@@ -97,7 +98,6 @@ files:
 - LICENSE.SPECS
 - README.md
 - Rakefile
-- appveyor.yml
 - ffi.gemspec
 - lib/2.2/ffi_c.so
 - lib/2.3/ffi_c.so
@@ -154,6 +154,7 @@ files:
 - lib/ffi/platform/sparcv9-solaris/types.conf
 - lib/ffi/platform/x86_64-cygwin/types.conf
 - lib/ffi/platform/x86_64-darwin/types.conf
+- lib/ffi/platform/x86_64-dragonflybsd/types.conf
 - lib/ffi/platform/x86_64-freebsd/types.conf
 - lib/ffi/platform/x86_64-freebsd12/types.conf
 - lib/ffi/platform/x86_64-linux/types.conf
@@ -183,7 +184,7 @@ files:
 - samples/pty.rb
 - samples/qsort.rb
 - samples/sample_helper.rb
-homepage: http://wiki.github.com/ffi/ffi
+homepage: https://github.com/ffi/ffi/wiki
 licenses:
 - BSD-3-Clause
 metadata: