diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
| commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
| tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /src/libs/mynewt-nimble/porting/nimble/include/log/log.h | |
| parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/libs/mynewt-nimble/porting/nimble/include/log/log.h')
| -rw-r--r-- | src/libs/mynewt-nimble/porting/nimble/include/log/log.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/mynewt-nimble/porting/nimble/include/log/log.h b/src/libs/mynewt-nimble/porting/nimble/include/log/log.h index 004667cc..b50c5b17 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/log/log.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/log/log.h @@ -30,11 +30,13 @@ log_dummy(void *log, ...) (void)log; } -#define LOG_DEBUG(_log, _mod, ...) NRF_LOG_DEBUG(## __VA_ARGS__) +#if MYNEWT +#define LOG_DEBUG(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_INFO(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_WARN(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_ERROR(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) #define LOG_CRITICAL(_log, _mod, ...) log_dummy(_log, ## __VA_ARGS__) +#endif struct log { }; |