Merge branch 'bugfix/extern_c_decl_4.1' into 'release/v4.1'

[cxx]: fixed extern "C" declarations (backport 4.1)

See merge request espressif/esp-idf!12743

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
+#endif

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
  */