diff options
| author | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
| commit | 854c6436b4e3b292fd04843795d0369dc8856783 (patch) | |
| tree | 4d5602f5c70926d2dcd01294561ddd8df4378462 /nuttx/include/debug.h | |
| parent | 6d138a845aabad31060bd00da0d20d177d3f4be4 (diff) | |
| parent | c38ad4ded570eddadeeca3579d02dfc63dcc8a9d (diff) | |
| download | px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.gz px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.bz2 px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.zip | |
Pull NuttX up to the 6.24 release.
Merge branch 'nuttx-merge-5447'
Diffstat (limited to 'nuttx/include/debug.h')
| -rw-r--r-- | nuttx/include/debug.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/nuttx/include/debug.h b/nuttx/include/debug.h index 1f8c7d7ca..aa5efd432 100644 --- a/nuttx/include/debug.h +++ b/nuttx/include/debug.h @@ -571,12 +571,9 @@ * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern +extern "C" +{ #endif /* These low-level debug APIs are provided by the NuttX library. If the @@ -585,21 +582,20 @@ extern "C" { * or the other of the following. */ -EXTERN int lib_rawprintf(FAR const char *format, ...); +int lib_rawprintf(FAR const char *format, ...); #ifdef CONFIG_ARCH_LOWPUTC -EXTERN int lib_lowprintf(FAR const char *format, ...); +int lib_lowprintf(FAR const char *format, ...); #endif /* Dump a buffer of data */ -EXTERN void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, - unsigned int buflen); +void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, unsigned int buflen); /* Enable or disable debug output */ #ifdef CONFIG_DEBUG_ENABLE -EXTERN void dbg_enable(bool enable); +void dbg_enable(bool enable); #endif /* If the cross-compiler's pre-processor does not support variable length @@ -608,23 +604,22 @@ EXTERN void dbg_enable(bool enable); #ifndef CONFIG_CPP_HAVE_VARARGS #ifdef CONFIG_DEBUG -EXTERN int dbg(const char *format, ...); +int dbg(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -EXTERN int lldbg(const char *format, ...); +int lldbg(const char *format, ...); # endif # ifdef CONFIG_DEBUG_VERBOSE -EXTERN int vdbg(const char *format, ...); +int vdbg(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -EXTERN int llvdbg(const char *format, ...); +int llvdbg(const char *format, ...); # endif #endif #endif /* CONFIG_DEBUG */ #endif /* CONFIG_CPP_HAVE_VARARGS */ -#undef EXTERN #if defined(__cplusplus) } #endif |