Skip to content

Commit 999048d

Browse files
committed
Revert "Disable the entire addrinfo struct on devkitppc"
This reverts commit 0254577. This commit is reversed because the s! macro can only appear once per module. However it is not possible to cfg-gate a structure inside of the macro
1 parent 0254577 commit 999048d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/unix/newlib/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pub type tcflag_t = ::c_uint;
2323
pub type time_t = i32;
2424
pub type useconds_t = u32;
2525

26-
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
27-
target_vendor = "nintendo")))]
2826
s! {
2927
// The order of the `ai_addr` field in this struct is crucial
3028
// for converting between the Rust and C types.
@@ -35,19 +33,21 @@ s! {
3533
pub ai_protocol: ::c_int,
3634
pub ai_addrlen: socklen_t,
3735

36+
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
37+
target_vendor = "nintendo")))]
3838
#[cfg(target_arch = "xtensa")]
3939
pub ai_addr: *mut sockaddr,
4040

4141
pub ai_canonname: *mut ::c_char,
4242

43+
#[cfg(not(all(libc_cfg_target_vendor, target_arch = "powerpc",
44+
target_vendor = "nintendo")))]
4345
#[cfg(not(target_arch = "xtensa"))]
4446
pub ai_addr: *mut sockaddr,
4547

4648
pub ai_next: *mut addrinfo,
4749
}
48-
}
4950

50-
s! {
5151
pub struct ip_mreq {
5252
pub imr_multiaddr: in_addr,
5353
pub imr_interface: in_addr,

0 commit comments

Comments
 (0)