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

[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
commit 2a715c811b
2 changed files with 6 additions and 6 deletions

View File

@ -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.

View File

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