From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 9 Jun 2025 03:00:01 +0000 (+0900)
Subject: musl: format-util: use %llu for formatting rlim_t
X-Git-Tag: v259-rc1~71^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a580dd4e53d218ceb7cb4cad46e7044dfa59bd48;p=thirdparty%2Fsystemd.git

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.
---

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