From 5f0d25724041fa522765472b5bb9bcecab2a80e7 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/2] 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 2026340752ea78f75e45fd2be629cf07550ca09a 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/2] clk.h: add extern C guards

Closes https://github.com/espressif/esp-idf/issues/4215
---
 components/esp32/include/esp32/clk.h             | 8 ++++++++
 components/esp32s2beta/include/esp32s2beta/clk.h | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/components/esp32/include/esp32/clk.h b/components/esp32/include/esp32/clk.h
index 4e32fd16eb..dde169a16e 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(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/esp32s2beta/include/esp32s2beta/clk.h b/components/esp32s2beta/include/esp32s2beta/clk.h
index 06ada586bd..8a0952fadc 100644
--- a/components/esp32s2beta/include/esp32s2beta/clk.h
+++ b/components/esp32s2beta/include/esp32s2beta/clk.h
@@ -13,6 +13,11 @@
 // limitations under the License.
 
 #pragma once
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * @file esp_clk.h
@@ -73,3 +78,7 @@ int esp_clk_apb_freq(void);
  * @return Value or RTC counter, expressed in microseconds
  */
 uint64_t esp_clk_rtc_time(void);
+
+#ifdef __cplusplus
+}
+#endif