From: Glenn Washburn <development@efficientek.com>
Date: Sat, 7 Nov 2020 04:44:24 +0000 (-0600)
Subject: types: Define GRUB_CHAR_BIT based on compiler macro instead of using literal
X-Git-Tag: grub-2.06-rc1~186
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f0715577c2709a77758092c6618effed18e80946;p=thirdparty%2Fgrub.git

types: Define GRUB_CHAR_BIT based on compiler macro instead of using literal

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/include/grub/types.h b/include/grub/types.h
index 035a4b528..f22055f98 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -72,6 +72,14 @@
 # endif
 #endif
 
+#ifndef __CHAR_BIT__
+# error __CHAR_BIT__ is not defined
+#elif __CHAR_BIT__ != 8
+# error __CHAR_BIT__ is not equal 8
+#else
+# define GRUB_CHAR_BIT	__CHAR_BIT__
+#endif
+
 /* Define various wide integers.  */
 typedef signed char		grub_int8_t;
 typedef short			grub_int16_t;
@@ -317,6 +325,4 @@ static inline void grub_set_unaligned64 (void *ptr, grub_uint64_t val)
   dd->d = val;
 }
 
-#define GRUB_CHAR_BIT 8
-
 #endif /* ! GRUB_TYPES_HEADER */