From: Thomas Haller <thaller@redhat.com>
Date: Fri, 8 Oct 2021 07:44:39 +0000 (+0200)
Subject: macro: fix ALIGN_TO() to use ULLONG_MAX instead of ULONGLONG_MAX
X-Git-Tag: v250-rc1~540
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4d294c46d9cb0f57fb2125cd6f2eec29f0ecc49;p=thirdparty%2Fsystemd.git

macro: fix ALIGN_TO() to use ULLONG_MAX instead of ULONGLONG_MAX

<limits.h> calls this ULLONG_MAX. It's not clear to me where ULONGLONG_MAX
can be found. This seems to be just a mistake.

Fixes: c7ed7187203c ('macro: handle overflow in ALIGN_TO() somewhat reasonably')
---

diff --git a/src/basic/macro.h b/src/basic/macro.h
index 6977a1ddd94..6d5840a832d 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -151,7 +151,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
         assert(__builtin_popcount(ali) == 1);
 #elif SIZE_MAX == ULONG_MAX
         assert(__builtin_popcountl(ali) == 1);
-#elif SIZE_MAX == ULONGLONG_MAX
+#elif SIZE_MAX == ULLONG_MAX
         assert(__builtin_popcountll(ali) == 1);
 #else
 #error "Unexpected size_t"