Skip to content

utmpx.rs: use correct constant names for musl libc #7459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 16, 2025
Merged

utmpx.rs: use correct constant names for musl libc #7459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591bef3
utmpx.rs: use correct constant names for musl libc
Ecordonnier Mar 15, 2025
f084b7f
make cargo fmt happy
Ecordonnier Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/uucore/src/lib/features/utmpx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,21 @@ macro_rules! chars2string {
mod ut {
pub static DEFAULT_FILE: &str = "/var/run/utmp";

#[cfg(target_env = "musl")]
pub use libc::UT_HOSTSIZE;
#[cfg(not(target_env = "musl"))]
pub use libc::__UT_HOSTSIZE as UT_HOSTSIZE;

#[cfg(target_env = "musl")]
pub use libc::UT_LINESIZE;
#[cfg(not(target_env = "musl"))]
pub use libc::__UT_LINESIZE as UT_LINESIZE;

#[cfg(target_env = "musl")]
pub use libc::UT_NAMESIZE;
#[cfg(not(target_env = "musl"))]
pub use libc::__UT_NAMESIZE as UT_NAMESIZE;

pub const UT_IDSIZE: usize = 4;

pub use libc::ACCOUNTING;
Expand Down
Loading