diff options
| author | bors <bors@rust-lang.org> | 2022-05-09 01:25:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-09 01:25:02 +0000 |
| commit | 4d72a1920682cbcff97348784b45853caae0cec8 (patch) | |
| tree | dbb23d693cbf2944bbdc1c4fce68d005382b8b7a | |
| parent | bdf2f4c3804561bf4b3aaea0da9e724f9501fba7 (diff) | |
| parent | 3608a81b9a1a9d2a1be39d96b5555bb498553f7a (diff) | |
| download | rust-libc-4d72a1920682cbcff97348784b45853caae0cec8.tar.gz | |
Auto merge of #2782 - asomers:kevent-data, r=Amanieu
Fix definition of kevent.data on 32-bit FreeBSD 12+
FreeBSD 12 changed this field from intptr_t to __int64_t
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs index 25c70c89e9..848db33993 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs @@ -22,7 +22,7 @@ s! { pub filter: ::c_short, pub flags: ::c_ushort, pub fflags: ::c_uint, - pub data: ::intptr_t, + pub data: i64, pub udata: *mut ::c_void, pub ext: [u64; 4], } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs index ceca64dda2..a929f9d290 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs @@ -25,7 +25,7 @@ s! { pub filter: ::c_short, pub flags: ::c_ushort, pub fflags: ::c_uint, - pub data: ::intptr_t, + pub data: i64, pub udata: *mut ::c_void, pub ext: [u64; 4], } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs index 902de45dc0..c655d555d9 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs @@ -25,7 +25,7 @@ s! { pub filter: ::c_short, pub flags: ::c_ushort, pub fflags: ::c_uint, - pub data: ::intptr_t, + pub data: i64, pub udata: *mut ::c_void, pub ext: [u64; 4], } |