Explorar o código

[cxx]: fixed extern "C" declarations

* Moving #includes above
  #ifdef __cplusplus extern "C" { #endif
  So that we can compile with CPP.

Signed-off-by: Jakob Hasse <jakob.hasse@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/6634
William Ferguson %!s(int64=5) %!d(string=hai) anos
pai
achega
be3fc35533

+ 2 - 2
components/driver/esp32s2/include/driver/touch_sensor.h

@@ -13,12 +13,12 @@
 
 #pragma once
 
+#include "driver/touch_sensor_common.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "driver/touch_sensor_common.h"
-
 /**
  * @brief Set touch sensor FSM start
  * @note  Start FSM after the touch sensor FSM mode is set.

+ 4 - 4
components/esp_adc_cal/include/esp_adc_cal.h

@@ -15,14 +15,14 @@
 #ifndef __ESP_ADC_CAL_H__
 #define __ESP_ADC_CAL_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include "esp_err.h"
 #include "driver/adc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Type of calibration value used in characterization
  */