Procházet zdrojové kódy

core/shared: Add guard to avoid redefine macro (#386)

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>

Co-authored-by: Huang Qi <huangqi3@xiaomi.com>
Huang Qi před 5 roky
rodič
revize
04a7cc322f

+ 10 - 0
core/shared/platform/include/platform_common.h

@@ -47,11 +47,21 @@ void BH_FREE(void *ptr);
 #endif
 
 #ifndef __cplusplus
+
+#ifndef true
 #define true 1
+#endif
+
+#ifndef false
 #define false 0
+#endif
+
+#ifndef inline
 #define inline __inline
 #endif
 
+#endif
+
 /* Return the offset of the given field in the given type */
 #ifndef offsetof
 #define offsetof(Type, field) ((size_t)(&((Type *)0)->field))

+ 10 - 0
core/shared/utils/bh_log.h

@@ -41,6 +41,16 @@ bh_log_set_verbose_level(uint32 level);
 void
 bh_log(LogLevel log_level, const char *file, int line, const char *fmt, ...);
 
+#ifdef BH_PLATFORM_NUTTX
+
+#undef LOG_FATAL
+#undef LOG_ERROR
+#undef LOG_WARNING
+#undef LOG_VERBOSE
+#undef LOG_DEBUG
+
+#endif
+
 #if BH_DEBUG == 1
 #define LOG_FATAL(...)   bh_log(BH_LOG_LEVEL_FATAL, __FILE__, __LINE__, __VA_ARGS__)
 #else