Skip to content

Commit 76dc6a9

Browse files
kaniinimyl7
authored andcommitted
musl: fix utmpx struct layout
- add padding members for musl 1.2 - ensure the padding members have an appropriate type (always c_int)
1 parent 06f4086 commit 76dc6a9

File tree

1 file changed

+0
-14
lines changed
  • src/unix/linux_like/linux/musl

1 file changed

+0
-14
lines changed

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,6 @@ s_no_extra_traits! {
355355
pub __reserved: [::c_char; 256],
356356
}
357357

358-
// FIXME: musl added paddings and adjusted
359-
// layout in 1.2.0 but our CI is still 1.1.24.
360-
// So, I'm leaving some fields as cfg for now.
361-
// ref. https://github.com/bminor/musl/commit/
362-
// 1e7f0fcd7ff2096904fd93a2ee6d12a2392be392
363-
//
364-
// OpenHarmony uses the musl 1.2 layout.
365358
pub struct utmpx {
366359
pub ut_type: ::c_short,
367360
__ut_pad1: ::c_short,
@@ -372,20 +365,13 @@ s_no_extra_traits! {
372365
pub ut_host: [::c_char; 256],
373366
pub ut_exit: __exit_status,
374367

375-
#[cfg(target_env = "musl")]
376-
pub ut_session: ::c_long,
377-
378-
#[cfg(target_env = "ohos")]
379368
#[cfg(target_endian = "little")]
380369
pub ut_session: ::c_int,
381-
#[cfg(target_env = "ohos")]
382370
#[cfg(target_endian = "little")]
383371
__ut_pad2: ::c_int,
384372

385-
#[cfg(target_env = "ohos")]
386373
#[cfg(not(target_endian = "little"))]
387374
__ut_pad2: ::c_int,
388-
#[cfg(target_env = "ohos")]
389375
#[cfg(not(target_endian = "little"))]
390376
pub ut_session: ::c_int,
391377

0 commit comments

Comments
 (0)