diff options
| author | Peter Atashian <retep998@gmail.com> | 2014-08-07 04:05:00 -0400 |
|---|---|---|
| committer | Peter Atashian <retep998@gmail.com> | 2014-08-07 04:05:00 -0400 |
| commit | feb219d23fd4236fc69ec86e34c088e232289534 (patch) | |
| tree | 460d17654ca883be34400eef5f1a17e0d8d54073 /src/liblibc | |
| parent | 51e19e750185f60e404412f702f8f2edc7bc1245 (diff) | |
| download | rust-feb219d23fd4236fc69ec86e34c088e232289534.tar.gz rust-feb219d23fd4236fc69ec86e34c088e232289534.zip | |
windows: Fix several tests on 64-bit.
Signed-off-by: Peter Atashian <retep998@gmail.com>
Diffstat (limited to 'src/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 1bc64ffcc92..fa29ab508ff 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -1142,18 +1142,17 @@ pub mod types { pub mod os { pub mod common { pub mod posix01 { - use types::os::arch::c95::{c_short, time_t, suseconds_t, + use types::os::arch::c95::{c_short, time_t, c_long}; use types::os::arch::extra::{int64, time64_t}; use types::os::arch::posix88::{dev_t, ino_t}; - use types::os::arch::posix88::mode_t; // pub Note: this is the struct called stat64 in win32. Not stat, // nor stati64. pub struct stat { pub st_dev: dev_t, pub st_ino: ino_t, - pub st_mode: mode_t, + pub st_mode: u16, pub st_nlink: c_short, pub st_uid: c_short, pub st_gid: c_short, @@ -1171,8 +1170,8 @@ pub mod types { } pub struct timeval { - pub tv_sec: time_t, - pub tv_usec: suseconds_t, + pub tv_sec: c_long, + pub tv_usec: c_long, } pub struct timespec { @@ -1186,7 +1185,7 @@ pub mod types { pub mod bsd44 { use types::os::arch::c95::{c_char, c_int, c_uint, size_t}; - pub type SOCKET = c_uint; + pub type SOCKET = uint; pub type socklen_t = c_int; pub type sa_family_t = u16; pub type in_port_t = u16; @@ -1197,6 +1196,7 @@ pub mod types { } pub struct sockaddr_storage { pub ss_family: sa_family_t, + pub __ss_pad1: [u8, ..6], pub __ss_align: i64, pub __ss_pad2: [u8, ..112], } @@ -1293,12 +1293,9 @@ pub mod types { pub mod posix88 { pub type off_t = i32; pub type dev_t = u32; - pub type ino_t = i16; + pub type ino_t = u16; - #[cfg(target_arch = "x86")] - pub type pid_t = i32; - #[cfg(target_arch = "x86_64")] - pub type pid_t = i64; + pub type pid_t = u32; pub type useconds_t = u32; pub type mode_t = u16; @@ -1415,7 +1412,7 @@ pub mod types { pub dwPageSize: DWORD, pub lpMinimumApplicationAddress: LPVOID, pub lpMaximumApplicationAddress: LPVOID, - pub dwActiveProcessorMask: DWORD, + pub dwActiveProcessorMask: uint, pub dwNumberOfProcessors: DWORD, pub dwProcessorType: DWORD, pub dwAllocationGranularity: DWORD, |