michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "global: Replace BUILD_ASSERT_MSG() with BUILD_ASSERT()"

Browse source 
This reverts commit 8739517107.

Pull Request #23437 was merged by mistake with an invalid manifest.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2020-03-19 15:59:14 +01:00 • committed by Carles Cufí
commit 4b37a8f3a4
52 changed files with 207 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/shell/shell_rtt.c
View file

@ -9,9 +9,9 @@
#include <SEGGER_RTT.h>
#include <logging/log.h>
BUILD_ASSERT(!(IS_ENABLED(CONFIG_LOG_BACKEND_RTT) &&
COND_CODE_0(CONFIG_LOG_BACKEND_RTT_BUFFER, (1), (0))),
"Conflicting log RTT backend enabled on the same channel");
BUILD_ASSERT_MSG(!(IS_ENABLED(CONFIG_LOG_BACKEND_RTT) &&
COND_CODE_0(CONFIG_LOG_BACKEND_RTT_BUFFER, (1), (0))),
"Conflicting log RTT backend enabled on the same channel");
SHELL_RTT_DEFINE(shell_transport_rtt);
SHELL_DEFINE(shell_rtt, CONFIG_SHELL_PROMPT_RTT, &shell_transport_rtt,