Skip to content

Commit afb35f7

Browse files
olsonjefferybrson
authored andcommitted
fix uv_timer_t size in 32bit linux and windows
.. 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)
1 parent bea02ee commit afb35f7

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/libstd/uv_ll.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ type uv_async_t = {
202202
};
203203

204204
// 64bit unix size: 128
205-
// 32bit unix size: ?
205+
// 32bit unix size: 84
206206
#[cfg(target_os = "linux")]
207207
#[cfg(target_os = "macos")]
208208
#[cfg(target_os = "freebsd")]
@@ -219,16 +219,16 @@ type uv_timer_t_32bit_unix_riders = {
219219
};
220220
#[cfg(target_arch="x86")]
221221
type uv_timer_t_32bit_unix_riders = {
222-
a10: *u8, a11: *u8, a12: *u8, a13: *u8
222+
a10: *u8, a11: *u8, a12: *u8, a13: *u8,
223+
a14: *u8, a15: *u8, a16: *u8
223224
};
224-
// win32 size: ?
225+
// win32 size: 64
225226
#[cfg(target_os = "win32")]
226227
type uv_timer_t = {
227228
fields: uv_handle_fields,
228229
a00: *u8, a01: *u8, a02: *u8, a03: *u8,
229230
a04: *u8, a05: *u8, a06: *u8, a07: *u8,
230-
a08: *u8, a09: *u8, a10: *u8, a11: *u8,
231-
a12: *u8
231+
a08: *u8, a09: *u8, a10: *u8, a11: *u8
232232
};
233233

234234
// unix size: 16
@@ -438,7 +438,9 @@ mod uv_ll_struct_stubgen {
438438
a08: 0 as *u8, a09: 0 as *u8,
439439
a11: {
440440
a10: 0 as *u8, a11: 0 as *u8,
441-
a12: 0 as *u8, a13: 0 as *u8
441+
a12: 0 as *u8, a13: 0 as *u8,
442+
a14: 0 as *u8, a15: 0 as *u8,
443+
a16: 0 as *u8
442444
}
443445
};
444446
}
@@ -453,8 +455,7 @@ mod uv_ll_struct_stubgen {
453455
a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
454456
a07: 0 as *u8,
455457
a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
456-
a11: 0 as *u8,
457-
a12: 0 as *u8
458+
a11: 0 as *u8
458459
};
459460
}
460461
#[cfg(target_os = "linux")]

0 commit comments

Comments
 (0)