Skip to content

Commit 9701517

Browse files
committed
std: Fix uv_tcp_t size on i686-apple-darwin
1 parent b126c74 commit 9701517

File tree

1 file changed

+66
-19
lines changed

1 file changed

+66
-19
lines changed

src/libstd/uv_ll.rs

Lines changed: 66 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,18 @@ pub struct uv_tcp_t {
9999
a08: *u8, a09: *u8, a10: *u8, a11: *u8,
100100
a12: *u8, a13: *u8, a14: *u8, a15: *u8,
101101
a16: *u8, a17: *u8, a18: *u8, a19: *u8,
102-
a20: *u8, a21: *u8, a22: *u8, a23: *u8
102+
a20: *u8, a21: *u8, a22: *u8,
103+
a23: uv_tcp_t_osx_riders
104+
}
105+
#[cfg(target_arch="x86_64")]
106+
pub struct uv_tcp_t_osx_riders {
107+
a23: *u8,
108+
}
109+
#[cfg(target_arch="x86")]
110+
#[cfg(target_arch="arm")]
111+
pub struct uv_tcp_t_osx_riders {
112+
a23: *u8,
113+
a24: *u8, a25: *u8,
103114
}
104115
#[cfg(target_os="linux")]
105116
#[cfg(target_os="freebsd")]
@@ -440,24 +451,60 @@ pub mod uv_ll_struct_stubgen {
440451
}
441452
#[cfg(target_os = "macos")]
442453
pub fn gen_stub_os() -> uv_tcp_t {
443-
uv_tcp_t {
444-
fields: uv_handle_fields {
445-
loop_handle: ptr::null(), type_: 0u32,
446-
close_cb: ptr::null(),
447-
data: ptr::null(),
448-
},
449-
a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
450-
a03: 0 as *u8,
451-
a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
452-
a07: 0 as *u8,
453-
a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
454-
a11: 0 as *u8,
455-
a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
456-
a15: 0 as *u8,
457-
a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
458-
a19: 0 as *u8,
459-
a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
460-
a23: 0 as *u8,
454+
use super::uv_tcp_t_osx_riders;
455+
456+
return gen_stub_arch();
457+
458+
#[cfg(target_arch = "x86_64")]
459+
fn gen_stub_arch() -> uv_tcp_t {
460+
uv_tcp_t {
461+
fields: uv_handle_fields {
462+
loop_handle: ptr::null(), type_: 0u32,
463+
close_cb: ptr::null(),
464+
data: ptr::null(),
465+
},
466+
a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
467+
a03: 0 as *u8,
468+
a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
469+
a07: 0 as *u8,
470+
a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
471+
a11: 0 as *u8,
472+
a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
473+
a15: 0 as *u8,
474+
a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
475+
a19: 0 as *u8,
476+
a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
477+
a23: uv_tcp_t_osx_riders {
478+
a23: 0 as *u8,
479+
}
480+
}
481+
}
482+
483+
#[cfg(target_arch = "x86")]
484+
#[cfg(target_arch = "arm")]
485+
fn gen_stub_arch() -> uv_tcp_t {
486+
uv_tcp_t {
487+
fields: uv_handle_fields {
488+
loop_handle: ptr::null(), type_: 0u32,
489+
close_cb: ptr::null(),
490+
data: ptr::null(),
491+
},
492+
a00: 0 as *u8, a01: 0 as *u8, a02: 0 as *u8,
493+
a03: 0 as *u8,
494+
a04: 0 as *u8, a05: 0 as *u8, a06: 0 as *u8,
495+
a07: 0 as *u8,
496+
a08: 0 as *u8, a09: 0 as *u8, a10: 0 as *u8,
497+
a11: 0 as *u8,
498+
a12: 0 as *u8, a13: 0 as *u8, a14: 0 as *u8,
499+
a15: 0 as *u8,
500+
a16: 0 as *u8, a17: 0 as *u8, a18: 0 as *u8,
501+
a19: 0 as *u8,
502+
a20: 0 as *u8, a21: 0 as *u8, a22: 0 as *u8,
503+
a23: uv_tcp_t_osx_riders {
504+
a23: 0 as *u8,
505+
a24: 0 as *u8, a25: 0 as *u8,
506+
}
507+
}
461508
}
462509
}
463510
}

0 commit comments

Comments
 (0)