Skip to content

Commit c1d1f34

Browse files
committed
Fix the definition of ino_t on 32-bit FreeBSD 12+
Commit 7437d0a erroneously defined it as "ulong" instead of u64. Nobody noticed the mistake, probably because it was only tested on 64-bit architectures, where those are equivalent. But it's a problem now, after #3723 , which switched the standard library to a FreeBSD 12 ABI. Issue rust-lang/rust#130677
1 parent c73a50d commit c1d1f34

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
pub type nlink_t = u16;
55
// Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:
66
pub type dev_t = u32;
7-
// Type of `ino_t` changed from `unsigned int` to `unsigned long` in FreeBSD 12:
7+
// Type of `ino_t` changed from `__uint32_t` to `__uint64_t` in FreeBSD 12:
88
pub type ino_t = u32;
99

1010
s! {

src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pub type nlink_t = u64;
44
pub type dev_t = u64;
5-
pub type ino_t = ::c_ulong;
5+
pub type ino_t = u64;
66
pub type shmatt_t = ::c_uint;
77

88
s! {

src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pub type nlink_t = u64;
44
pub type dev_t = u64;
5-
pub type ino_t = ::c_ulong;
5+
pub type ino_t = u64;
66
pub type shmatt_t = ::c_uint;
77
pub type kpaddr_t = u64;
88
pub type kssize_t = i64;

src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pub type nlink_t = u64;
44
pub type dev_t = u64;
5-
pub type ino_t = ::c_ulong;
5+
pub type ino_t = u64;
66
pub type shmatt_t = ::c_uint;
77
pub type kpaddr_t = u64;
88
pub type kssize_t = i64;

src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pub type nlink_t = u64;
44
pub type dev_t = u64;
5-
pub type ino_t = ::c_ulong;
5+
pub type ino_t = u64;
66
pub type shmatt_t = ::c_uint;
77
pub type kpaddr_t = u64;
88
pub type kssize_t = i64;

0 commit comments

Comments
 (0)