macro: move sizeof_field() macro into src/fundamental/

Let's make this macro available for our EFI code too.

diff --git a/src/basic/macro.h b/src/basic/macro.h
index 19d5039fd3bf451dc2020eec27b2ba3ce03a4ea0..72910d9c383dd95f11a5d21064df41b0e056c75d 100644 (file)
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -218,9 +218,6 @@ static inline int __coverity_check_and_return__(int condition) {
 
 #define char_array_0(x) x[sizeof(x)-1] = 0;
 
-#define sizeof_field(struct_type, member) sizeof(((struct_type *) 0)->member)
-#define endoffsetof_field(struct_type, member) (offsetof(struct_type, member) + sizeof_field(struct_type, member))
-
 /* Maximum buffer size needed for formatting an unsigned integer type as hex, including space for '0x'
  * prefix and trailing NUL suffix. */
 #define HEXADECIMAL_STR_MAX(type) (2 + sizeof(type) * 2 + 1)

diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index bbfdcdb2187beec9f640fb1f105cf9bbf5fbfc26..2595f5501cc01422bd870e28fb7a11ee273ca790 100644 (file)
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -546,3 +546,6 @@ static inline uint64_t ALIGN_OFFSET_U64(uint64_t l, uint64_t ali) {
 #else
         #define DECLARE_SBAT(text)
 #endif
+
+#define sizeof_field(struct_type, member) sizeof(((struct_type *) 0)->member)
+#define endoffsetof_field(struct_type, member) (offsetof(struct_type, member) + sizeof_field(struct_type, member))