From 13b0633e8dee5f2246ced9fc5dec4051eb288783 Mon Sep 17 00:00:00 2001 From: William Ferguson Date: Mon, 1 Mar 2021 09:21:44 +1000 Subject: [PATCH] [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 Merges https://github.com/espressif/esp-idf/pull/6634 --- components/driver/esp32s2beta/include/touch_sensor.h | 2 +- components/esp_adc_cal/include/esp_adc_cal.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/driver/esp32s2beta/include/touch_sensor.h b/components/driver/esp32s2beta/include/touch_sensor.h index fd6a055a97..784ae45d38 100644 --- a/components/driver/esp32s2beta/include/touch_sensor.h +++ b/components/driver/esp32s2beta/include/touch_sensor.h @@ -454,4 +454,4 @@ esp_err_t touch_pad_sleep_channel_read_proximity_cnt(uint32_t *proximity_cnt); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/components/esp_adc_cal/include/esp_adc_cal.h b/components/esp_adc_cal/include/esp_adc_cal.h index b1798847bd..b5a869e28a 100644 --- a/components/esp_adc_cal/include/esp_adc_cal.h +++ b/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 #include "esp_err.h" #include "driver/adc.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Type of calibration value used in characterization */