From 6e182d7ed36e48373cc4d024c5fdf6e5a77160fd Mon Sep 17 00:00:00 2001 From: yuanjm Date: Tue, 31 Aug 2021 16:26:55 +0800 Subject: [PATCH 1/2] dhcpserver: support cplusplus Closes https://github.com/espressif/esp-idf/issues/7494 Merges https://github.com/espressif/esp-idf/pull/7526 --- components/lwip/include/apps/dhcpserver/dhcpserver.h | 8 ++++++++ .../lwip/include/apps/dhcpserver/dhcpserver_options.h | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/components/lwip/include/apps/dhcpserver/dhcpserver.h b/components/lwip/include/apps/dhcpserver/dhcpserver.h index 39a58bbfa9..262ebf43d8 100644 --- a/components/lwip/include/apps/dhcpserver/dhcpserver.h +++ b/components/lwip/include/apps/dhcpserver/dhcpserver.h @@ -17,6 +17,10 @@ #include "sdkconfig.h" #include "lwip/ip_addr.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct dhcps_state{ s16_t state; } dhcps_state; @@ -91,4 +95,8 @@ void dhcps_dns_setserver(const ip_addr_t *dnsserver); ip4_addr_t dhcps_dns_getserver(void); void dhcps_set_new_lease_cb(dhcps_cb_t cb); +#ifdef __cplusplus +} #endif + +#endif /* __DHCPS_H__ */ diff --git a/components/lwip/include/apps/dhcpserver/dhcpserver_options.h b/components/lwip/include/apps/dhcpserver/dhcpserver_options.h index 38d46f6bff..31a6799283 100644 --- a/components/lwip/include/apps/dhcpserver/dhcpserver_options.h +++ b/components/lwip/include/apps/dhcpserver/dhcpserver_options.h @@ -13,6 +13,9 @@ // limitations under the License. #pragma once +#ifdef __cplusplus +extern "C" { +#endif /** DHCP Options This macros are not part of the public dhcpserver.h interface. @@ -132,3 +135,7 @@ typedef enum DOMAIN_SEARCH = 119, CLASSLESS_ROUTE = 121, } dhcp_msg_option; + +#ifdef __cplusplus +} +#endif From 72cbfbf26ab9fc1308fb7cf56da04da9d4546bfe Mon Sep 17 00:00:00 2001 From: yuanjm Date: Wed, 8 Sep 2021 15:53:32 +0800 Subject: [PATCH 2/2] ci: Remove public headers check exceptions for dhcp --- tools/ci/check_public_headers_exceptions.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index b0756d1141..e38e07564b 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -26,9 +26,6 @@ components/esp32/include/esp32/cache_err_int.h components/driver/include/driver/sdmmc_defs.h components/driver/include/driver/sdmmc_types.h -components/lwip/include/apps/dhcpserver/dhcpserver_options.h -components/lwip/include/apps/dhcpserver/dhcpserver.h - components/lwip/lwip/src/include/lwip/priv/memp_std.h components/lwip/port/esp32/include/arch/cc.h components/lwip/port/esp32/include/debug/lwip_debug.h