From 3c0c1bfa8da7a6ab7ae00a430d2cd0de47728e9e Mon Sep 17 00:00:00 2001 From: Bradley Bolen Date: Mon, 13 May 2019 16:37:11 -0400 Subject: [PATCH] shell: Fix checks of Kconfig options The compiler was generating errors of the form error: "CONFIG_LOG" is not defined, evaluates to 0 [-Werror=undef] when -Wundef is used and the config option was turned off. Change several #if checks to #ifdef. Signed-off-by: Bradley Bolen --- include/shell/shell.h | 2 +- include/shell/shell_history.h | 2 +- include/shell/shell_log_backend.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/shell/shell.h b/include/shell/shell.h index 7092c550aa3..bbb4c60c45e 100644 --- a/include/shell/shell.h +++ b/include/shell/shell.h @@ -500,7 +500,7 @@ struct shell_stats { u32_t log_lost_cnt; /*!< Lost log counter.*/ }; -#if CONFIG_SHELL_STATS +#ifdef CONFIG_SHELL_STATS #define SHELL_STATS_DEFINE(_name) static struct shell_stats _name##_stats #define SHELL_STATS_PTR(_name) (&(_name##_stats)) #else diff --git a/include/shell/shell_history.h b/include/shell/shell_history.h index 9db81438c2a..2ce6a8d9bc0 100644 --- a/include/shell/shell_history.h +++ b/include/shell/shell_history.h @@ -29,7 +29,7 @@ struct shell_history_item { char data[]; }; -#if CONFIG_SHELL_HISTORY +#ifdef CONFIG_SHELL_HISTORY #define SHELL_HISTORY_DEFINE(_name, block_size, block_count) \ \ K_MEM_SLAB_DEFINE(_name##_history_memslab, \ diff --git a/include/shell/shell_log_backend.h b/include/shell/shell_log_backend.h index 9e937f96518..01fdb1ed081 100644 --- a/include/shell/shell_log_backend.h +++ b/include/shell/shell_log_backend.h @@ -64,7 +64,7 @@ int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx); * * @param _name Shell name. */ -#if CONFIG_LOG +#ifdef CONFIG_LOG #define SHELL_LOG_BACKEND_DEFINE(_name, _buf, _size, _queue_size, _timeout) \ LOG_BACKEND_DEFINE(_name##_backend, log_backend_shell_api, false); \ K_MSGQ_DEFINE(_name##_msgq, sizeof(struct shell_log_backend_msg), \