From aa8d14febf090cdd750ec0daa150312479a9c344 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Mon, 22 May 2017 18:18:26 +0200 Subject: [PATCH] Fix wrong FFI types on Windows x64 (fixes #1307) --- .../ffi/platform/x86_64-windows/platform.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf b/lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf index 7f269734336..7aa35a3dd13 100644 --- a/lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf +++ b/lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf @@ -430,8 +430,8 @@ rbx.platform.typedef._fpos_t = long rbx.platform.typedef._fpos64_t = long_long rbx.platform.typedef._ssize_t = int rbx.platform.typedef.wint_t = uint -rbx.platform.typedef.ptrdiff_t = int -rbx.platform.typedef.size_t = uint +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 @@ -443,16 +443,16 @@ 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 +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.pid_t = long_long +rbx.platform.typedef.ssize_t = long_long 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.useconds_t = uint rbx.platform.typedef.suseconds_t = long rbx.platform.typedef.int8_t = char rbx.platform.typedef.int16_t = short @@ -478,7 +478,7 @@ 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_long -rbx.platform.typedef.intptr_t = int +rbx.platform.typedef.intptr_t = long_long rbx.platform.typedef.uintptr_t = ulong_long rbx.platform.typedef.intmax_t = long_long rbx.platform.typedef.uintmax_t = ulong_long @@ -486,7 +486,7 @@ 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 = ulong +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 @@ -501,7 +501,7 @@ 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 = ulong_long +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