From a580dd4e53d218ceb7cb4cad46e7044dfa59bd48 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 9 Jun 2025 12:00:01 +0900 Subject: [PATCH] musl: format-util: use %llu for formatting rlim_t glibc uses uint32_t or uint64_t for rlim_t, while musl uses unsigned long long. --- src/basic/format-util.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h index c603e99d820..16727c45bd4 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h @@ -39,12 +39,18 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); # error Unknown timex member size #endif -#if SIZEOF_RLIM_T == 8 -# define RLIM_FMT "%" PRIu64 -#elif SIZEOF_RLIM_T == 4 -# define RLIM_FMT "%" PRIu32 +#ifdef __GLIBC__ +# if SIZEOF_RLIM_T == 8 +# define RLIM_FMT "%" PRIu64 +# elif SIZEOF_RLIM_T == 4 +# define RLIM_FMT "%" PRIu32 +# else +# error Unknown rlim_t size +# endif #else -# error Unknown rlim_t size +/* Assume musl, and it unconditionally uses unsigned long long. */ +assert_cc(SIZEOF_RLIM_T == 8); +# define RLIM_FMT "%llu" #endif #if SIZEOF_DEV_T == 8 -- 2.47.3