sd-boot: Move flags helpers to macro-fundamental.h

diff --git a/src/basic/macro.h b/src/basic/macro.h
index 03a0d061b8b50394ad66fbfa0624718f23a51938..aa04039e804f11171c2cee07fe3bfae0a19f5a8b 100644 (file)
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -328,13 +328,6 @@ static inline int __coverity_check_and_return__(int condition) {
                 ans;                                    \
         })
 
-#define UPDATE_FLAG(orig, flag, b)                      \
-        ((b) ? ((orig) | (flag)) : ((orig) & ~(flag)))
-#define SET_FLAG(v, flag, b) \
-        (v) = UPDATE_FLAG(v, flag, b)
-#define FLAGS_SET(v, flags) \
-        ((~(v) & (flags)) == 0)
-
 #define SWAP_TWO(x, y) do {                        \
                 typeof(x) _t = (x);                \
                 (x) = (y);                         \

diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index ed527adb775716aff812bedf2b762b043407fc40..44af0bd0a02face3ccea3e62ca205f8e5aabaf28 100644 (file)
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -306,3 +306,10 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                 (l <= SIZE_MAX - (ali - 1)),      /* overflow? */      \
                 ((l) + (ali) - 1) & ~((ali) - 1),                      \
                 VOID_0)
+
+#define UPDATE_FLAG(orig, flag, b)                      \
+        ((b) ? ((orig) | (flag)) : ((orig) & ~(flag)))
+#define SET_FLAG(v, flag, b) \
+        (v) = UPDATE_FLAG(v, flag, b)
+#define FLAGS_SET(v, flags) \
+        ((~(v) & (flags)) == 0)