Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/esp32: fix C linkage compilation error [backport 2020.01] #13144

Merged
merged 1 commit into from
Jan 17, 2020
Merged

cpu/esp32: fix C linkage compilation error [backport 2020.01] #13144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions boards/common/esp32/include/board_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@
#include "periph/gpio.h"
#include "sdk_conf.h"

#if MODULE_MTD
#include "mtd.h"
#endif

#ifdef __cplusplus
extern "C" {
extern "C" {
#endif

/**
Expand Down Expand Up @@ -103,7 +107,6 @@
* Built-in SPI flash memory is used as MTD system drive.
* @{
*/
#include "mtd.h"

/**
* @brief MTD drive start address in SPI flash memory
Expand Down
4 changes: 2 additions & 2 deletions cpu/esp32/include/sdk_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@

#ifndef DOXYGEN

#include "board.h"

#ifdef __cplusplus
extern "C" {
#endif

#include "board.h"

/**
* @brief Defines the CPU frequency [values = 2, 40, 80, 160 and 240]
*/
Expand Down