Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add _ to the beginning of all debug macros to avoid name collisions

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-16 12:33:32 -06:00
parent fdaf3d7268
commit 0c8c7fecf0
252 changed files with 1348 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/debug.h
+396 -394
View File
File diff suppressed because it is too large Load Diff
include/nuttx/mm/shm.h
+4 -4
View File
@@ -77,16 +77,16 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG_SHM
# define shmerr(format, ...) err(format, ##__VA_ARGS__)
# define shminfo(format, ...) info(format, ##__VA_ARGS__)
# define shmerr(format, ...) _err(format, ##__VA_ARGS__)
# define shminfo(format, ...) _info(format, ##__VA_ARGS__)
# else
# define shmerr(format, ...) merr(format, ##__VA_ARGS__)
# define shminfo(format, ...) minfo(format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_DEBUG_SHM
# define shmerr err
# define shminfo info
# define shmerr _err
# define shminfo _info
# else
# define shmerr (void)
# define shminfo (void)
include/nuttx/wireless/nrf24l01.h
+4 -4
View File
@@ -91,10 +91,10 @@
/* NRF24L01 debug */
#ifdef NRF24L01_DEBUG
# define werr(format, ...) err(format, ##__VA_ARGS__)
# define wllerr(format, ...) llerr(format, ##__VA_ARGS__)
# define winfo(format, ...) info(format, ##__VA_ARGS__)
# define wllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
# define werr(format, ...) _err(format, ##__VA_ARGS__)
# define wllerr(format, ...) _llerr(format, ##__VA_ARGS__)
# define winfo(format, ...) _info(format, ##__VA_ARGS__)
# define wllinfo(format, ...) _llinfo(format, ##__VA_ARGS__)
#else
# define werr(x...)
# define wllerr(x...)
include/sys/wait.h
+1 -1
View File
@@ -50,7 +50,7 @@
****************************************************************************/
/* The following are provided for analysis of returned status values.
* Encoded is as follows as 2 bytes of info(MS) then two bytes of code (LS).
* Encoded is as follows as 2 bytes of _info(MS) then two bytes of code (LS).
* Code:
* 0 - Child has exited, info is the exit code.
* Other values - Not implemented