Skip to content

Commit

Permalink
fix alignment of pthread_attr_t
Browse files Browse the repository at this point in the history
Closes #10300
  • Loading branch information
thestinger committed Nov 6, 2013
1 parent 7fb583b commit 1c6ae5c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/libstd/libc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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};

Expand Down Expand Up @@ -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};
Expand Down Expand Up @@ -404,7 +404,7 @@ pub mod types {
}

pub struct pthread_attr_t {
__size: [c_char, ..36]
__size: [u32, ..9]
}
}
pub mod posix08 {}
Expand Down Expand Up @@ -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};
Expand Down Expand Up @@ -480,7 +480,7 @@ pub mod types {
}

pub struct pthread_attr_t {
__size: [c_char, ..56]
__size: [u64, ..7]
}
}
pub mod posix08 {
Expand Down

5 comments on commit 1c6ae5c

@bors
Copy link
Contributor

@bors bors commented on 1c6ae5c Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 1c6ae5c Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/align = 1c6ae5c into auto

@bors
Copy link
Contributor

@bors bors commented on 1c6ae5c Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/align = 1c6ae5c merged ok, testing candidate = efaf730

@bors
Copy link
Contributor

@bors bors commented on 1c6ae5c Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 1c6ae5c Nov 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = efaf730

Please sign in to comment.