feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_cplusplus_miss_in_dhcp_v4.1' into 'release/v4.1'

Browse Source 
dhcpserver: support cplusplus (backport v4.1)

See merge request espressif/esp-idf!15361
This commit is contained in:
Yuan Jian Min
2021-10-14 11:59:38 +00:00
parent ef647e941e f570b33b66
commit 0c46c56c01
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/lwip/include/apps/dhcpserver/dhcpserver.h
View File

@@ -17,6 +17,10 @@
#include "sdkconfig.h" #include "sdkconfig.h"
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct dhcps_state{ typedef struct dhcps_state{
s16_t state; s16_t state;
} dhcps_state; } dhcps_state;
@@ -91,5 +95,8 @@ void dhcps_dns_setserver(const ip_addr_t *dnsserver);
ip4_addr_t dhcps_dns_getserver(void); ip4_addr_t dhcps_dns_getserver(void);
void dhcps_set_new_lease_cb(dhcps_cb_t cb); void dhcps_set_new_lease_cb(dhcps_cb_t cb);
#ifdef __cplusplus
}
#endif #endif
#endif /* __DHCPS_H__ */

7
components/lwip/include/apps/dhcpserver/dhcpserver_options.h
View File

@@ -13,6 +13,9 @@
// limitations under the License. // limitations under the License.
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
/** DHCP Options /** DHCP Options
This macros are not part of the public dhcpserver.h interface. This macros are not part of the public dhcpserver.h interface.
@@ -132,3 +135,7 @@ typedef enum
DOMAIN_SEARCH = 119, DOMAIN_SEARCH = 119,
CLASSLESS_ROUTE = 121, CLASSLESS_ROUTE = 121,
} dhcp_msg_option; } dhcp_msg_option;
#ifdef __cplusplus
}
#endif