mirror of
https://github.com/apache/nuttx.git
synced 2026-06-01 16:59:28 +08:00
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>
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
# include <stddef.h>
|
# include <stddef.h>
|
||||||
# include <nuttx/nuttx.h>
|
# include <nuttx/macro.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
#include <nuttx/irq.h>
|
#include <nuttx/irq.h>
|
||||||
#include <nuttx/nuttx.h>
|
#include <nuttx/macro.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
@@ -136,5 +136,10 @@
|
|||||||
#define FOREACH_ARG(action, ...) \
|
#define FOREACH_ARG(action, ...) \
|
||||||
FOREACH_ARG_(action, GET_ARG_COUNT(__VA_ARGS__), ##__VA_ARGS__)
|
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 */
|
#endif /* __INCLUDE_NUTTX_MACRO_H */
|
||||||
|
|
||||||
|
|||||||
@@ -78,9 +78,4 @@
|
|||||||
#define container_of(ptr, type, member) \
|
#define container_of(ptr, type, member) \
|
||||||
((type *)((uintptr_t)(ptr) - offsetof(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 */
|
#endif /* __INCLUDE_NUTTX_NUTTX_H */
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
#include <nuttx/board.h>
|
#include <nuttx/board.h>
|
||||||
#include <nuttx/fs/fs.h>
|
#include <nuttx/fs/fs.h>
|
||||||
#include <nuttx/init.h>
|
#include <nuttx/init.h>
|
||||||
#include <nuttx/nuttx.h>
|
#include <nuttx/macro.h>
|
||||||
#include <nuttx/symtab.h>
|
#include <nuttx/symtab.h>
|
||||||
#include <nuttx/trace.h>
|
#include <nuttx/trace.h>
|
||||||
#include <nuttx/wqueue.h>
|
#include <nuttx/wqueue.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user