rustc: more arch-specific fallout from 2db3abd

diff --git a/src/libcore/libc.rs b/src/libcore/libc.rs
index 0a58f66740c8481caa84b019c042dcac3b12c736..fb541f2e46057c19f8cc05b2f7298de1cac47e98 100644 (file)
--- a/src/libcore/libc.rs
+++ b/src/libcore/libc.rs
@@ -243,6 +243,12 @@ pub mod posix88 {
                 pub type ssize_t = i32;
             }
             pub mod posix01 {
+                use libc::types::os::arch::c95::{c_int, c_short, c_long,
+                                                 time_t};
+                use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
+                use libc::types::os::arch::posix88::{mode_t, off_t};
+                use libc::types::os::arch::posix88::{uid_t};
+
                 pub type nlink_t = u32;
                 pub type blksize_t = i32;
                 pub type blkcnt_t = i32;
@@ -443,9 +449,8 @@ pub mod os {
         pub mod common {
             pub mod posix01 {
                 use libc::types::os::arch::c95::{c_int, c_short};
-                use libc::types::os::arch::c99::int64_t;
-                use libc::types::os::arch::extra::time64_t;
-                use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
+                use libc::types::os::arch::extra::{int64, time64_t};
+                use libc::types::os::arch::posix88::{dev_t, ino_t};
                 use libc::types::os::arch::posix88::mode_t;
 
                 // Note: this is the struct called stat64 in win32. Not stat,
@@ -458,7 +463,7 @@ pub struct stat {
                     st_uid: c_short,
                     st_gid: c_short,
                     st_rdev: dev_t,
-                    st_size: int64_t,
+                    st_size: int64,
                     st_atime: time64_t,
                     st_mtime: time64_t,
                     st_ctime: time64_t,
@@ -539,6 +544,7 @@ pub mod extra {
                 pub type WORD = u16;
 
                 pub type time64_t = i64;
+                pub type int64 = i64;
             }
         }
     }