Merge branch 'bugfix/esp_netif_public_headers' into 'master'

esp_netif: Fix implicit includes in public headers (GitHub PR)

Closes IDFGH-6002

See merge request espressif/esp-idf!15535

components/esp_netif/include/esp_netif_ip_addr.h

@@ -1,20 +1,13 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #ifndef _ESP_NETIF_IP_ADDR_H_
 #define _ESP_NETIF_IP_ADDR_H_
 
+#include <stdint.h>
 #include <machine/endian.h>
 
 #ifdef __cplusplus

components/esp_netif/include/esp_netif_types.h

@@ -1,20 +1,18 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #ifndef _ESP_NETIF_TYPES_H_
 #define _ESP_NETIF_TYPES_H_
 
+#include <stdbool.h>
+#include <stdint.h>
+#include "esp_event_base.h"
+#include "esp_err.h"
+#include "esp_netif_ip_addr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

tools/ci/check_copyright_ignore.txt

@@ -859,12 +859,10 @@ components/esp_netif/esp_netif_handlers.c
 components/esp_netif/esp_netif_objects.c
 components/esp_netif/include/esp_netif.h
 components/esp_netif/include/esp_netif_defaults.h
-components/esp_netif/include/esp_netif_ip_addr.h
 components/esp_netif/include/esp_netif_net_stack.h
 components/esp_netif/include/esp_netif_ppp.h
 components/esp_netif/include/esp_netif_slip.h
 components/esp_netif/include/esp_netif_sta_list.h
-components/esp_netif/include/esp_netif_types.h
 components/esp_netif/loopback/esp_netif_loopback.c
 components/esp_netif/lwip/esp_netif_lwip.c
 components/esp_netif/lwip/esp_netif_lwip_defaults.c

tools/ci/check_public_headers_exceptions.txt

@@ -132,8 +132,6 @@ components/esp_event/include/esp_event_base.h
 components/esp_netif/include/esp_netif_sta_list.h
 components/esp_netif/include/esp_netif_defaults.h
 components/esp_netif/include/esp_netif_net_stack.h
-components/esp_netif/include/esp_netif_types.h
-components/esp_netif/include/esp_netif_ip_addr.h
 components/esp_netif/include/esp_netif_ppp.h
 components/tcpip_adapter/include/tcpip_adapter_compatible/tcpip_adapter_compat.h
 components/bootloader_support/include/bootloader_util.h