Extern C blocks (#1352) (#4044)

* Add extern C guard blocks to SDK header files #1352

* fixed some extern C blocks in core and libraries

Author: devyte

cores/esp8266/pgmspace.h

@@ -4,9 +4,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #ifdef __ets__
 
@@ -26,6 +23,10 @@ extern "C" {
 #endif // __ets__
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define _SFR_BYTE(n) (n)
 
 typedef void prog_void;

cores/esp8266/umm_malloc/umm_malloc_cfg.h

@@ -6,13 +6,13 @@
 #define _UMM_MALLOC_CFG_H
 
 #include <debug.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
 #include "c_types.h"
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 /*
  * There are a number of defines you can set at compile time that affect how
  * the memory allocator will operate.

libraries/GDBStub/src/internal/gdbstub-entry.h

@@ -19,7 +19,7 @@ int gdbstub_del_hw_watchpoint(int addr);
 extern void* gdbstub_do_break_breakpoint_addr;
 
 #ifdef __cplusplus
-{
+}
 #endif
 
-#endif
+#endif

tools/sdk/include/at_custom.h

@@ -27,6 +27,10 @@
 
 #include "c_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct
 {
   char *at_cmdName;
@@ -169,4 +173,8 @@ bool at_fake_uart_enable(bool enable,at_fake_uart_tx_func_type at_fake_uart_tx_f
   */
 bool at_set_escape_character(uint8 ch);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

tools/sdk/include/espconn.h

@@ -25,6 +25,10 @@
 #ifndef __ESPCONN_H__
 #define __ESPCONN_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef sint8 err_t;
 
 typedef void *espconn_handle;
@@ -742,5 +746,13 @@ void espconn_dns_setserver(uint8 numdns, ip_addr_t *dnsserver);
  *  Returns     : dnsserver -- IP address of the DNS server to set
 *******************************************************************************/
 ip_addr_t espconn_dns_getserver(uint8 numdns);
+
+
+#ifdef __cplusplus
+}
 #endif
 
+#endif
+
+
+

tools/sdk/include/espnow.h

@@ -25,6 +25,11 @@
 #ifndef __ESPNOW_H__
 #define __ESPNOW_H__
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum esp_now_role {
 	ESP_NOW_ROLE_IDLE = 0,
 	ESP_NOW_ROLE_CONTROLLER,
@@ -70,4 +75,8 @@ int esp_now_get_cnt_info(u8 *all_cnt, u8 *encrypt_cnt);
 
 int esp_now_set_kok(u8 *key, u8 len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

tools/sdk/include/ets_sys.h

@@ -29,6 +29,10 @@
 #include "eagle_soc.h"
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef uint32_t ETSSignal;
 typedef uint32_t ETSParam;
 
@@ -213,4 +217,8 @@ bool ets_task(ETSTask task, uint8 prio, ETSEvent *queue, uint8 qlen);
 bool ets_post(uint8 prio, ETSSignal sig, ETSParam par);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ETS_SYS_H */

tools/sdk/include/gpio.h

@@ -25,6 +25,10 @@
 #ifndef _GPIO_H_
 #define _GPIO_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GPIO_PIN_ADDR(i) (GPIO_PIN0_ADDRESS + i*4)
 
 #define GPIO_ID_IS_PIN_REGISTER(reg_id) \
@@ -116,4 +120,8 @@ void gpio_pin_wakeup_disable();
 
 void gpio_pin_intr_state_set(uint32 i, GPIO_INT_TYPE intr_state);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // _GPIO_H_

tools/sdk/include/ip_addr.h

@@ -27,6 +27,10 @@
 
 #include "c_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ip_addr {
     uint32 addr;
 };
@@ -84,4 +88,9 @@ uint32 ipaddr_addr(const char *cp);
 
 #define IPSTR "%d.%d.%d.%d"
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IP_ADDR_H__ */

tools/sdk/include/mem.h

@@ -25,6 +25,10 @@
 #ifndef __MEM_H__
 #define __MEM_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Note: check_memleak_debug_enable is a weak function inside SDK.
  * please copy following codes to user_main.c.
 #include "mem.h"
@@ -77,5 +81,10 @@ do{\
 
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif