Skip to content

Commit d0fa688

Browse files
committed
rustc: more arch-specific fallout from 2db3abd
1 parent dd5734d commit d0fa688

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/libcore/libc.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@ pub mod types {
243243
pub type ssize_t = i32;
244244
}
245245
pub mod posix01 {
246+
use libc::types::os::arch::c95::{c_int, c_short, c_long,
247+
time_t};
248+
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
249+
use libc::types::os::arch::posix88::{mode_t, off_t};
250+
use libc::types::os::arch::posix88::{uid_t};
251+
246252
pub type nlink_t = u32;
247253
pub type blksize_t = i32;
248254
pub type blkcnt_t = i32;
@@ -443,9 +449,8 @@ pub mod types {
443449
pub mod common {
444450
pub mod posix01 {
445451
use libc::types::os::arch::c95::{c_int, c_short};
446-
use libc::types::os::arch::c99::int64_t;
447-
use libc::types::os::arch::extra::time64_t;
448-
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
452+
use libc::types::os::arch::extra::{int64, time64_t};
453+
use libc::types::os::arch::posix88::{dev_t, ino_t};
449454
use libc::types::os::arch::posix88::mode_t;
450455

451456
// Note: this is the struct called stat64 in win32. Not stat,
@@ -458,7 +463,7 @@ pub mod types {
458463
st_uid: c_short,
459464
st_gid: c_short,
460465
st_rdev: dev_t,
461-
st_size: int64_t,
466+
st_size: int64,
462467
st_atime: time64_t,
463468
st_mtime: time64_t,
464469
st_ctime: time64_t,
@@ -539,6 +544,7 @@ pub mod types {
539544
pub type WORD = u16;
540545

541546
pub type time64_t = i64;
547+
pub type int64 = i64;
542548
}
543549
}
544550
}

0 commit comments

Comments
 (0)