Skip to content

Commit 4910ac1

Browse files
author
Jakub Wieczorek
committed
---
yaml --- r: 117695 b: refs/heads/auto c: 8e34f64 h: refs/heads/master i: 117693: 96b6c20 117691: 5a3cfb1 117687: 596ee08 117679: 46ddcff 117663: 0c5b13d 117631: 6a4562d v: v3
1 parent bcf360b commit 4910ac1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 135625df96733dae77544de7abb2eae71f4946fc
16+
refs/heads/auto: 8e34f647ee5db795e1ea46715de61cee63f4f4a7
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustrt/mutex.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,12 @@ mod imp {
298298
static _PTHREAD_MUTEX_SIG_init: libc::c_long = 0x32AAABA7;
299299
static _PTHREAD_COND_SIG_init: libc::c_long = 0x3CB0B1BB;
300300

301+
#[repr(C)]
301302
pub struct pthread_mutex_t {
302303
__sig: libc::c_long,
303304
__opaque: [u8, ..__PTHREAD_MUTEX_SIZE__],
304305
}
306+
#[repr(C)]
305307
pub struct pthread_cond_t {
306308
__sig: libc::c_long,
307309
__opaque: [u8, ..__PTHREAD_COND_SIZE__],
@@ -363,7 +365,9 @@ mod imp {
363365
mod os {
364366
use libc;
365367

368+
#[repr(C)]
366369
pub struct pthread_mutex_t { value: libc::c_int }
370+
#[repr(C)]
367371
pub struct pthread_cond_t { value: libc::c_int }
368372

369373
pub static PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {

0 commit comments

Comments
 (0)