From c7ac9a296de9674b99e82c96304c72bd5d960bd4 Mon Sep 17 00:00:00 2001
From: Gabriel Durante <gbdurante@gmail.com>
Date: Tue, 29 Oct 2019 07:25:41 -0300
Subject: [PATCH 1/3] Added Cpp compatibility for
 components/spi_flash/include/esp_flash_spi_init.h

Merges https://github.com/espressif/esp-idf/pull/4260
---
 components/spi_flash/include/esp_flash_spi_init.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/spi_flash/include/esp_flash_spi_init.h b/components/spi_flash/include/esp_flash_spi_init.h
index f7e9816183..0e0e72d832 100644
--- a/components/spi_flash/include/esp_flash_spi_init.h
+++ b/components/spi_flash/include/esp_flash_spi_init.h
@@ -17,6 +17,10 @@
 #include "hal/spi_types.h"
 #include "esp_flash.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Configurations for the SPI Flash to init
 typedef struct {
     spi_host_device_t host_id;      ///< Bus to use
@@ -53,3 +57,6 @@ esp_err_t spi_bus_add_flash_device(esp_flash_t **out_chip, const esp_flash_spi_d
  */
 esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
 
+#ifdef __cplusplus
+}
+#endif

From 192c20c9f7612f945b0ee43bf7ddef8187446deb Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 5 Nov 2019 14:56:16 +0100
Subject: [PATCH 2/3] clk.h: add extern C guards

Closes https://github.com/espressif/esp-idf/issues/4215
---
 components/esp32/include/esp32/clk.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/esp32/include/esp32/clk.h b/components/esp32/include/esp32/clk.h
index 9393fc1f5d..613fa5a985 100644
--- a/components/esp32/include/esp32/clk.h
+++ b/components/esp32/include/esp32/clk.h
@@ -15,6 +15,10 @@
 #pragma once
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file esp32/clk.h
  *
@@ -85,3 +89,7 @@ int esp_clk_xtal_freq(void);
  * @return Value or RTC counter, expressed in microseconds
  */
 uint64_t esp_clk_rtc_time();
+
+#ifdef __cplusplus
+}
+#endif

From 17bd6e8faba15812780d21e6e3db08fb26dd7033 Mon Sep 17 00:00:00 2001
From: boarchuz <46267286+boarchuz@users.noreply.github.com>
Date: Sat, 21 Dec 2019 12:12:54 +1100
Subject: [PATCH 3/3] Add missing extern "C" to rtc_cntl.h

Related: https://github.com/espressif/arduino-esp32/issues/3149
---
 components/driver/include/driver/rtc_cntl.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/driver/include/driver/rtc_cntl.h b/components/driver/include/driver/rtc_cntl.h
index a79745713e..44fd015096 100644
--- a/components/driver/include/driver/rtc_cntl.h
+++ b/components/driver/include/driver/rtc_cntl.h
@@ -18,6 +18,10 @@
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Register a handler for specific RTC_CNTL interrupts
  *
@@ -46,3 +50,7 @@ esp_err_t rtc_isr_register(intr_handler_t handler, void* handler_arg,
  *        handler_arg isn't registered
  */
 esp_err_t rtc_isr_deregister(intr_handler_t handler, void* handler_arg);
+
+#ifdef __cplusplus
+}
+#endif