Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d618f045bf4
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85540c307664
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2017

  1. Fix wrong FFI types on Windows x64 (fixes #1307)

    @MSNexploder
    MSNexploder committed May 22, 2017
    Copy the full SHA
    aa8d14f View commit details

Commits on Jun 13, 2017

  1. Merge pull request #4620 from MSNexploder/ffi_windows 

    Fix wrong FFI types on Windows x64
    @headius
    headius authored Jun 13, 2017
    Copy the full SHA
    85540c3 View commit details
Showing with 9 additions and 9 deletions.
  1. +9 −9 lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf
18 changes: 9 additions & 9 deletions lib/ruby/stdlib/ffi/platform/x86_64-windows/platform.conf
View file
Original file line number Diff line number Diff line change
@@ -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,15 +478,15 @@ 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
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