Redefine AM_JOINSTR() in common/compiler.h to avoid cross-include with common/macros.h

Author: adel-mamin

libs/async/test.c

@@ -26,6 +26,7 @@
 
 #include <string.h>
 
+#include "common/compiler.h"
 #include "common/macros.h"
 
 #include "async/async.h"

libs/common/compiler.h

@@ -446,28 +446,45 @@
     AM_ENABLE_WARNING(AM_W_DATE_TIME)                  \
     AM_ENABLE_WARNING(AM_W_NULL_DEREFERENCE)
 
+/** Internal stringification macro helper. */
+#define AM_STRINGIFY_IMPL2(s) #s
+/** Internal stringification macro. */
+#define AM_STRINGIFY_IMPL(s) AM_STRINGIFY_IMPL2(s)
+/** Join x and y together. */
+#define AM_JOINSTR_(x, y) AM_STRINGIFY_IMPL(x##y)
+
 #if (AM_COMPILER_ID == AM_COMPILER_CLANG)
+
 #define AM_DISABLE_WARNING(warning) \
     AM_DIAG_PRAGMA(clang, push)     \
     AM_DIAG_PRAGMA(clang, ignored AM_JOINSTR_(-W, warning))
 #define AM_ENABLE_WARNING(warning) AM_DIAG_PRAGMA(clang, pop)
+
 #elif defined(_MSC_VER)
+
 #define AM_DISABLE_WARNING(warning) \
     AM_DIAG_PRAGMA(msvc, push)      \
     AM_DIAG_DO_PRAGMA(warning(disable :##warning))
 #define AM_ENABLE_WARNING(warning) AM_DIAG_PRAGMA(msvc, pop)
+
 #elif (AM_COMPILER_ID == AM_COMPILER_GCC)
+
 #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
+
 #define AM_DISABLE_WARNING(warning) \
     AM_DIAG_PRAGMA(GCC, push)       \
     AM_DIAG_PRAGMA(GCC, ignored AM_JOINSTR_(-W, warning))
 #define AM_ENABLE_WARNING(warning) AM_DIAG_PRAGMA(GCC, pop)
+
 #else
+
 #define AM_DISABLE_WARNING(warning) \
     AM_DIAG_PRAGMA(GCC, ignored AM_JOINSTR_(-W, warning))
 #define AM_ENABLE_WARNING(warning) \
     AM_DIAG_PRAGMA(GCC, warning AM_JOINSTR_(-W, warning))
+
 #endif /* __GNUC__ */
+
 #endif /* AM_COMPILER_ID */
 
 /* taken from https://github.com/sustrik/libdill */

libs/common/macros.h

@@ -132,7 +132,7 @@ AM_NORETURN void am_assert_failure(
 #define AM_STRINGIFY_(s) #s
 #define AM_STRINGIFY(s) AM_STRINGIFY_(s)
 /** Join x and y together. */
-#define AM_JOINSTR_(x, y) AM_STRINGIFY(x##y)
+#define AM_JOINSTR(x, y) AM_STRINGIFY(x##y)
 
 /** Counts the number of trailing zeros in a word. */
 #define AM_COUNT_TRAILING_ZEROS(word)           \

libs/strlib/strlib.h

@@ -41,7 +41,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "common/macros.h"
+#include "common/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {

libs/strlib/test.c

@@ -37,6 +37,7 @@
 #include <string.h>
 
 #include "common/macros.h"
+#include "common/compiler.h"
 #include "strlib/strlib.h"
 
 static void string_is_true(const char *str) {

libs/timer/timer.h

@@ -35,7 +35,7 @@
 
 #include <stdbool.h>
 
-#include "common/macros.h"
+#include "common/compiler.h"
 #include "event/event.h"
 #include "slist/slist.h"
 #include "pal/pal.h"