espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[cxx]: fixed extern "C" declarations (backport v4.3)

See merge request espressif/esp-idf!12741
This commit is contained in:
Jiang Jiang Jian
2021-03-30 03:09:46 +00:00
parent 17aa9c5ec4 a71d9cc466
commit 2a715c811b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/esp32s2/include/driver/touch_sensor.h
View File

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

8
components/esp_adc_cal/include/esp_adc_cal.h
View File

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