alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-04 06:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cxx]: fixed extern "C" declarations

Browse Source 
* 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
Closes https://github.com/espressif/esp-idf/issues/6633
This commit is contained in:
William Ferguson
2021-03-01 09:21:44 +10:00
committed by Jakob Hasse
parent 9a2d251912
commit a71d9cc466
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
*/ */