From 505adfa277f597e8ea08f389f93ed7e64ad35b82 Mon Sep 17 00:00:00 2001
From: chenzhijia <chenzhijia@xiaomi.com>
Date: Thu, 19 Sep 2024 10:42:42 +0800
Subject: [PATCH] nuttx:move "#define STRINGIFY(x)" to nuttx/macro.h

Franklin requirement, "#define STRINGIFY(x)" conflicts with https://github.com/mborgerding/kissfft define

Signed-off-by: chenzhijia <chenzhijia@xiaomi.com>
Signed-off-by: lipengfei28 <lipengfei28@xiaomi.com>
---
 arch/arm64/include/arch.h                       | 2 +-
 arch/xtensa/src/common/xtensa_saveusercontext.c | 2 +-
 include/nuttx/macro.h                           | 5 +++++
 include/nuttx/nuttx.h                           | 5 -----
 sched/init/nx_bringup.c                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/include/arch.h b/arch/arm64/include/arch.h
index f3b29fd6f81c3..157169cea9fea 100644
--- a/arch/arm64/include/arch.h
+++ b/arch/arm64/include/arch.h
@@ -34,7 +34,7 @@
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
 #  include <stddef.h>
-#  include <nuttx/nuttx.h>
+#  include <nuttx/macro.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/xtensa/src/common/xtensa_saveusercontext.c b/arch/xtensa/src/common/xtensa_saveusercontext.c
index 427ec858d443b..c89bf7427abb5 100644
--- a/arch/xtensa/src/common/xtensa_saveusercontext.c
+++ b/arch/xtensa/src/common/xtensa_saveusercontext.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
-#include <nuttx/nuttx.h>
+#include <nuttx/macro.h>
 
 #include <string.h>
 
diff --git a/include/nuttx/macro.h b/include/nuttx/macro.h
index c9c2481430705..f36634be205b3 100644
--- a/include/nuttx/macro.h
+++ b/include/nuttx/macro.h
@@ -136,5 +136,10 @@
 #define FOREACH_ARG(action, ...) \
         FOREACH_ARG_(action, GET_ARG_COUNT(__VA_ARGS__), ##__VA_ARGS__)
 
+/* Stringify the arguments */
+
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x)  STRINGIFY_(x)
+
 #endif /* __INCLUDE_NUTTX_MACRO_H */
 
diff --git a/include/nuttx/nuttx.h b/include/nuttx/nuttx.h
index 8efc09723b460..484c66b8bdcf4 100644
--- a/include/nuttx/nuttx.h
+++ b/include/nuttx/nuttx.h
@@ -78,9 +78,4 @@
 #define container_of(ptr, type, member) \
   ((type *)((uintptr_t)(ptr) - offsetof(type, member)))
 
-/* Stringify the arguments */
-
-#define STRINGIFY_(x) #x
-#define STRINGIFY(x)  STRINGIFY_(x)
-
 #endif /* __INCLUDE_NUTTX_NUTTX_H */
diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c
index e3da041d996ca..2ea82b920ad33 100644
--- a/sched/init/nx_bringup.c
+++ b/sched/init/nx_bringup.c
@@ -36,7 +36,7 @@
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/init.h>
-#include <nuttx/nuttx.h>
+#include <nuttx/macro.h>
 #include <nuttx/symtab.h>
 #include <nuttx/trace.h>
 #include <nuttx/wqueue.h>