diff options
| author | bors <bors@rust-lang.org> | 2013-11-05 20:41:07 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-05 20:41:07 -0800 |
| commit | efaf730347fa7e01f8d1852be7c9a447f147763c (patch) | |
| tree | a4c5e5562d2b456f21ddaa6b960be83f7f772288 /src/libstd | |
| parent | b17d4e335db38db731581fca104212fa13e8776d (diff) | |
| parent | 1c6ae5c5a2bbbbce634b58337cdea2c7a5ddd275 (diff) | |
| download | rust-efaf730347fa7e01f8d1852be7c9a447f147763c.tar.gz rust-efaf730347fa7e01f8d1852be7c9a447f147763c.zip | |
auto merge of #10305 : thestinger/rust/align, r=alexcrichton
Closes #10300
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/libc.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 9c84f770807..5a02df431e5 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -297,7 +297,7 @@ pub mod types { } #[cfg(target_arch = "x86")] pub mod posix01 { - use libc::types::os::arch::c95::{c_char, c_short, c_long, time_t}; + use libc::types::os::arch::c95::{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}; @@ -330,12 +330,12 @@ pub mod types { } pub struct pthread_attr_t { - __size: [c_char, ..36] + __size: [u32, ..9] } } #[cfg(target_arch = "arm")] pub mod posix01 { - use libc::types::os::arch::c95::{c_char, c_uchar, c_uint, c_ulong, time_t}; + use libc::types::os::arch::c95::{c_uchar, c_uint, c_ulong, time_t}; use libc::types::os::arch::c99::{c_longlong, c_ulonglong}; use libc::types::os::arch::posix88::{uid_t, gid_t, ino_t}; @@ -366,12 +366,12 @@ pub mod types { } pub struct pthread_attr_t { - __size: [c_char, ..36] + __size: [u32, ..9] } } #[cfg(target_arch = "mips")] pub mod posix01 { - use libc::types::os::arch::c95::{c_char, c_long, c_ulong, time_t}; + use libc::types::os::arch::c95::{c_long, c_ulong, time_t}; use libc::types::os::arch::posix88::{gid_t, ino_t}; use libc::types::os::arch::posix88::{mode_t, off_t}; use libc::types::os::arch::posix88::{uid_t}; @@ -404,7 +404,7 @@ pub mod types { } pub struct pthread_attr_t { - __size: [c_char, ..36] + __size: [u32, ..9] } } pub mod posix08 {} @@ -450,7 +450,7 @@ pub mod types { pub type ssize_t = i64; } pub mod posix01 { - use libc::types::os::arch::c95::{c_char, c_int, c_long, time_t}; + use libc::types::os::arch::c95::{c_int, 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}; @@ -480,7 +480,7 @@ pub mod types { } pub struct pthread_attr_t { - __size: [c_char, ..56] + __size: [u64, ..7] } } pub mod posix08 { |