mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix uv_timer_t size in 32bit linux and windows

Browse Source 
.. fixes issue, in previous commit, with global loop test hanging on
32bit linux (this was because the struct was too small, so (presumably),
the data member was garbled.. yippy)
This commit is contained in:
Jeff Olson 2012-04-17 15:18:11 -07:00 committed by Brian Anderson
parent bea02ee351
commit afb35f752f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/uv_ll.rs
View File

@ -202,7 +202,7 @@ enum uv_handle_type {
};
// 64bit unix size: 128
// 32bit unix size: ?
// 32bit unix size: 84
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
#[cfg(target_os = "freebsd")]
@ -219,16 +219,16 @@ enum uv_handle_type {
};
#[cfg(target_arch="x86")]
type uv_timer_t_32bit_unix_riders = {
a10: *u8, a11: *u8, a12: *u8, a13: *u8
a10: *u8, a11: *u8, a12: *u8, a13: *u8,
a14: *u8, a15: *u8, a16: *u8
};
// win32 size: ?
// win32 size: 64
#[cfg(target_os = "win32")]
type uv_timer_t = {
fields: uv_handle_fields,
a00: *u8, a01: *u8, a02: *u8, a03: *u8,
a04: *u8, a05: *u8, a06: *u8, a07: *u8,
a08: *u8, a09: *u8, a10: *u8, a11: *u8,
a12: *u8
a08: *u8, a09: *u8, a10: *u8, a11: *u8
};
// unix size: 16
@ -438,7 +438,9 @@ fn gen_stub_arch() -> uv_timer_t {
a08: 0 as *u8, a09: 0 as *u8,
a11: {
a10: 0 as *u8, a11: 0 as *u8,
a12: 0 as *u8, a13: 0 as *u8
a12: 0 as *u8, a13: 0 as *u8,
a14: 0 as *u8, a15: 0 as *u8,
a16: 0 as *u8
}
};
}
@ -453,8 +455,7 @@ fn gen_stub_uv_timer_t() -> uv_timer_t {
a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
a07: 0 as *u8,
a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
a11: 0 as *u8,
a12: 0 as *u8
a11: 0 as *u8
};
}
#[cfg(target_os = "linux")]