From 94ce8444fcc79be5b0e527b62d96c21f3021ebf0 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 28 Jul 2020 18:20:30 -0700 Subject: [PATCH] esp_netif: Fix -Wundef issues with esp_netif.h Partially addresses https://github.com/espressif/esp-idf/pull/5179 --- components/esp_netif/include/esp_netif.h | 6 +++--- components/esp_netif/include/esp_netif_defaults.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_netif/include/esp_netif.h b/components/esp_netif/include/esp_netif.h index 5d74222979..0623ade9d8 100644 --- a/components/esp_netif/include/esp_netif.h +++ b/components/esp_netif/include/esp_netif.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,7 +14,7 @@ #include "esp_netif_types.h" #include "esp_netif_defaults.h" -#if CONFIG_ETH_ENABLED +#ifdef CONFIG_ETH_ENABLED #include "esp_eth_netif_glue.h" #endif @@ -22,7 +22,7 @@ // Note: tcpip_adapter legacy API has to be included by default to provide full compatibility // for applications that used tcpip_adapter API without explicit inclusion of tcpip_adapter.h // -#if CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER +#ifdef CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER #define _ESP_NETIF_SUPPRESS_LEGACY_WARNING_ #include "tcpip_adapter.h" #undef _ESP_NETIF_SUPPRESS_LEGACY_WARNING_ diff --git a/components/esp_netif/include/esp_netif_defaults.h b/components/esp_netif/include/esp_netif_defaults.h index b8276068e9..e531288c4f 100644 --- a/components/esp_netif/include/esp_netif_defaults.h +++ b/components/esp_netif/include/esp_netif_defaults.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -213,7 +213,7 @@ extern const esp_netif_inherent_config_t _g_esp_netif_inherent_slip_config; extern const esp_netif_ip_info_t _g_esp_netif_soft_ap_ip; #endif -#if CONFIG_OPENTHREAD_ENABLED +#ifdef CONFIG_OPENTHREAD_ENABLED /** * @brief Default configuration reference of SLIP client */