Skip to content

Commit

Permalink
libstd: Add missing constants for arm/linux.
Browse files Browse the repository at this point in the history
  • Loading branch information
luqmana committed Feb 5, 2014
1 parent 6aad3bf commit f286859
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/libstd/unstable/mutex.rs
Expand Up @@ -153,13 +153,17 @@ mod imp {
static __SIZEOF_PTHREAD_MUTEX_T: uint = 40 - 8;
#[cfg(target_arch = "x86")]
static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8;
#[cfg(target_arch = "arm")]
static __SIZEOF_PTHREAD_MUTEX_T: uint = 24 - 8;
#[cfg(target_arch = "x86_64")]
static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8;
#[cfg(target_arch = "x86")]
static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8;
#[cfg(target_arch = "arm")]
static __SIZEOF_PTHREAD_COND_T: uint = 48 - 8;

pub struct pthread_mutex_t {
__align: libc::c_long,
__align: libc::c_longlong,
size: [u8, ..__SIZEOF_PTHREAD_MUTEX_T],
}
pub struct pthread_cond_t {
Expand Down

5 comments on commit f286859

@bors
Copy link
Contributor

@bors bors commented on f286859 Feb 6, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at luqmana@f286859

@bors
Copy link
Contributor

@bors bors commented on f286859 Feb 6, 2014

Choose a reason for hiding this comment

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

merging luqmana/rust/arm-fix = f286859 into auto

@bors
Copy link
Contributor

@bors bors commented on f286859 Feb 6, 2014

Choose a reason for hiding this comment

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

luqmana/rust/arm-fix = f286859 merged ok, testing candidate = 27dcd87

@bors
Copy link
Contributor

@bors bors commented on f286859 Feb 6, 2014

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 f286859 Feb 6, 2014

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 = 27dcd87

Please sign in to comment.