alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wundef_wsign_compare' into 'master'

Browse Source 
esp_netif: Fix -Wundef issues with esp_netif.h (GitHub PR)

Closes IDFGH-6598

See merge request espressif/esp-idf!16801
This commit is contained in:
David Čermák 2022-02-07 09:03:52 +00:00
commit 95c3f96801
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_netif/include/esp_netif.h
View File

@ -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 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -14,7 +14,7 @@
#include "esp_netif_types.h" #include "esp_netif_types.h"
#include "esp_netif_defaults.h" #include "esp_netif_defaults.h"
#if CONFIG_ETH_ENABLED #ifdef CONFIG_ETH_ENABLED
#include "esp_eth_netif_glue.h" #include "esp_eth_netif_glue.h"
#endif #endif
@ -22,7 +22,7 @@
// Note: tcpip_adapter legacy API has to be included by default to provide full compatibility // 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 // 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_ #define _ESP_NETIF_SUPPRESS_LEGACY_WARNING_
#include "tcpip_adapter.h" #include "tcpip_adapter.h"
#undef _ESP_NETIF_SUPPRESS_LEGACY_WARNING_ #undef _ESP_NETIF_SUPPRESS_LEGACY_WARNING_

4
components/esp_netif/include/esp_netif_defaults.h
View File

@ -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 * 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; extern const esp_netif_ip_info_t _g_esp_netif_soft_ap_ip;
#endif #endif
#if CONFIG_OPENTHREAD_ENABLED #ifdef CONFIG_OPENTHREAD_ENABLED
/** /**
* @brief Default configuration reference of SLIP client * @brief Default configuration reference of SLIP client
*/ */