From 9edaaffac91d593a439e44bac3b6f5558f5a8245 Mon Sep 17 00:00:00 2001 From: Ax333l Date: Thu, 17 Aug 2023 00:00:00 +0000 Subject: [PATCH 2/6] Define GRUB_UINT32_MAX Signed-off-by: Nicholas Johnson --- include/grub/types.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/grub/types.h b/include/grub/types.h index 0d96006fe..a13f3a60b 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -156,6 +156,7 @@ typedef grub_int32_t grub_ssize_t; #define GRUB_SHRT_MAX 0x7fff #define GRUB_SHRT_MIN (-GRUB_SHRT_MAX - 1) #define GRUB_UINT_MAX 4294967295U +#define GRUB_UINT32_MAX 4294967295U #define GRUB_INT_MAX 0x7fffffff #define GRUB_INT_MIN (-GRUB_INT_MAX - 1) #define GRUB_INT32_MAX 2147483647 @@ -177,6 +178,13 @@ typedef grub_int32_t grub_ssize_t; #define GRUB_TYPE_U_MAX(type) ((unsigned long long)((typeof (type))(~0))) #define GRUB_TYPE_U_MIN(type) 0ULL +# define GRUB_UINT32_C(x) x ## U +# if GRUB_ULONG_MAX >> 31 >> 31 >> 1 == 1 +# define GRUB_UINT64_C(x) x##UL +# elif 1 +# define GRUB_UINT64_C(x) x##ULL +# endif + typedef grub_uint64_t grub_properly_aligned_t; #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properly_aligned_t)] -- 2.39.2