Skip to content

Commit bd82d37

Browse files
committed
Fix Haiku build
1 parent 7836cb1 commit bd82d37

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

src/unix/haiku/mod.rs

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@ s! {
6969
pub sin6_scope_id: u32,
7070
}
7171

72-
pub struct sockaddr_un {
73-
pub sun_len: u8,
74-
pub sun_family: sa_family_t,
75-
pub sun_path: [::c_char; 126]
76-
}
77-
78-
pub struct sockaddr_storage {
79-
pub ss_len: u8,
80-
pub ss_family: sa_family_t,
81-
__ss_pad1: [u8; 6],
82-
__ss_pad2: u64,
83-
__ss_pad3: [u8; 112],
84-
}
85-
8672
pub struct addrinfo {
8773
pub ai_flags: ::c_int,
8874
pub ai_family: ::c_int,
@@ -211,15 +197,6 @@ s! {
211197
pub st_blocks: blkcnt_t,
212198
}
213199

214-
pub struct dirent {
215-
pub d_dev: dev_t,
216-
pub d_pdev: dev_t,
217-
pub d_ino: ino_t,
218-
pub d_pino: i64,
219-
pub d_reclen: ::c_ushort,
220-
pub d_name: [::c_char; 1024], // Max length is _POSIX_PATH_MAX
221-
}
222-
223200
pub struct glob_t {
224201
pub gl_pathc: ::size_t,
225202
__unused1: ::size_t,
@@ -331,6 +308,32 @@ s! {
331308
}
332309
}
333310

311+
s_no_extra_traits! {
312+
#[allow(missing_debug_implementations)]
313+
pub struct sockaddr_un {
314+
pub sun_len: u8,
315+
pub sun_family: sa_family_t,
316+
pub sun_path: [::c_char; 126]
317+
}
318+
#[allow(missing_debug_implementations)]
319+
pub struct sockaddr_storage {
320+
pub ss_len: u8,
321+
pub ss_family: sa_family_t,
322+
__ss_pad1: [u8; 6],
323+
__ss_pad2: u64,
324+
__ss_pad3: [u8; 112],
325+
}
326+
#[allow(missing_debug_implementations)]
327+
pub struct dirent {
328+
pub d_dev: dev_t,
329+
pub d_pdev: dev_t,
330+
pub d_ino: ino_t,
331+
pub d_pino: i64,
332+
pub d_reclen: ::c_ushort,
333+
pub d_name: [::c_char; 1024], // Max length is _POSIX_PATH_MAX
334+
}
335+
}
336+
334337
// intentionally not public, only used for fd_set
335338
cfg_if! {
336339
if #[cfg(target_pointer_width = "32")] {

0 commit comments

Comments
 (0)