Skip to content

Commit 616d1ea

Browse files
committed
Fixed struct/constants order
1 parent b1f04a6 commit 616d1ea

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

src/unix/newlib/horizon/mod.rs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,40 @@ pub type daddr_t = c_long;
2020
pub type caddr_t = *mut c_char;
2121
pub type sbintime_t = ::c_longlong;
2222

23+
// External implementations are needed to use networking and threading.
24+
s! {
25+
pub struct sockaddr {
26+
pub sa_family: ::sa_family_t,
27+
pub sa_data: [::c_char; 14],
28+
}
29+
30+
pub struct sockaddr_storage {
31+
pub ss_family: ::sa_family_t,
32+
pub __ss_padding: [c_char; 26usize],
33+
}
34+
35+
pub struct sockaddr_in {
36+
pub sin_family: ::sa_family_t,
37+
pub sin_port: in_port_t,
38+
pub sin_addr: ::in_addr,
39+
pub sin_zero: [::c_uchar; 8usize],
40+
}
41+
42+
pub struct sockaddr_in6 {
43+
pub sin6_family: ::sa_family_t,
44+
pub sin6_port: ::in_port_t,
45+
pub sin6_flowinfo: u32,
46+
pub sin6_addr: ::in6_addr,
47+
pub sin6_scope_id: u32,
48+
}
49+
50+
pub struct sockaddr_un {
51+
pub sun_len: ::c_uchar,
52+
pub sun_family: ::sa_family_t,
53+
pub sun_path: [::c_char; 104usize],
54+
}
55+
}
56+
2357
pub const SIGEV_NONE: ::c_int = 1;
2458
pub const SIGEV_SIGNAL: ::c_int = 2;
2559
pub const SIGEV_THREAD: ::c_int = 3;
@@ -114,40 +148,6 @@ pub const FIONBIO: ::c_ulong = 1;
114148

115149
pub const RTLD_DEFAULT: *mut ::c_void = 0 as *mut ::c_void;
116150

117-
// External implementations are needed to use networking and threading.
118-
s! {
119-
pub struct sockaddr {
120-
pub sa_family: ::sa_family_t,
121-
pub sa_data: [::c_char; 14],
122-
}
123-
124-
pub struct sockaddr_storage {
125-
pub ss_family: ::sa_family_t,
126-
pub __ss_padding: [c_char; 26usize],
127-
}
128-
129-
pub struct sockaddr_in {
130-
pub sin_family: ::sa_family_t,
131-
pub sin_port: in_port_t,
132-
pub sin_addr: ::in_addr,
133-
pub sin_zero: [::c_uchar; 8usize],
134-
}
135-
136-
pub struct sockaddr_in6 {
137-
pub sin6_family: ::sa_family_t,
138-
pub sin6_port: ::in_port_t,
139-
pub sin6_flowinfo: u32,
140-
pub sin6_addr: ::in6_addr,
141-
pub sin6_scope_id: u32,
142-
}
143-
144-
pub struct sockaddr_un {
145-
pub sun_len: ::c_uchar,
146-
pub sun_family: ::sa_family_t,
147-
pub sun_path: [::c_char; 104usize],
148-
}
149-
}
150-
151151
// Horizon OS works doesn't or can't hold any of this information
152152
safe_f! {
153153
pub {const} fn WIFSTOPPED(_status: ::c_int) -> bool {

0 commit comments

Comments
 (0)