Skip to content

Commit

Permalink
Add missing repr(C) annotations to mutex.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub Wieczorek committed Jun 9, 2014
1 parent 135625d commit 8e34f64
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/librustrt/mutex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,12 @@ mod imp {
static _PTHREAD_MUTEX_SIG_init: libc::c_long = 0x32AAABA7;
static _PTHREAD_COND_SIG_init: libc::c_long = 0x3CB0B1BB;

#[repr(C)]
pub struct pthread_mutex_t {
__sig: libc::c_long,
__opaque: [u8, ..__PTHREAD_MUTEX_SIZE__],
}
#[repr(C)]
pub struct pthread_cond_t {
__sig: libc::c_long,
__opaque: [u8, ..__PTHREAD_COND_SIZE__],
Expand Down Expand Up @@ -363,7 +365,9 @@ mod imp {
mod os {
use libc;

#[repr(C)]
pub struct pthread_mutex_t { value: libc::c_int }
#[repr(C)]
pub struct pthread_cond_t { value: libc::c_int }

pub static PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
Expand Down

9 comments on commit 8e34f64

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 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 8e34f64 Jun 10, 2014

Choose a reason for hiding this comment

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

merging jakub-/rust/dead-struct-fields = 8e34f64 into auto

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 2014

Choose a reason for hiding this comment

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

jakub-/rust/dead-struct-fields = 8e34f64 merged ok, testing candidate = f18e3342

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 2014

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 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 8e34f64 Jun 10, 2014

Choose a reason for hiding this comment

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

merging jakub-/rust/dead-struct-fields = 8e34f64 into auto

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 2014

Choose a reason for hiding this comment

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

jakub-/rust/dead-struct-fields = 8e34f64 merged ok, testing candidate = 9bb8f88

@bors
Copy link
Contributor

@bors bors commented on 8e34f64 Jun 10, 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 = 9bb8f88

Please sign in to comment.