Skip to content

Fix module-import-in-extern-c compiler error #10488

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

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
+10 −4
Open

Fix module-import-in-extern-c compiler error #10488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67b64bc
Fix module-import-in-extern-c compiler error
zacharykeyessonos Oct 31, 2025
765f9d9
Add changelog entry
zacharykeyessonos Nov 3, 2025
3123f1e
Add the -fmodules flag to the cpp_dummy_build_cpp test program
zacharykeyessonos Nov 3, 2025
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
5 changes: 5 additions & 0 deletions ChangeLog.d/fix-module-import-in-extern-c-compiler-error.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Changes
* Fixes a compiler error when building C++ projects that use the 'modules'
C++ language feature, and consume Mbed TLS. The specific error is
module-import-in-extern-c, which occurs when an #include occurs within
'extern C' blocks.
8 changes: 4 additions & 4 deletions include/mbedtls/timing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@

#include <stdint.h>

#ifdef __cplusplus
extern "C" {
#endif

#if !defined(MBEDTLS_TIMING_ALT)
// Regular implementation
//
Expand All @@ -43,6 +39,10 @@ typedef struct mbedtls_timing_delay_context {
#include "timing_alt.h"
#endif /* MBEDTLS_TIMING_ALT */

#ifdef __cplusplus
extern "C" {
#endif

/* Internal use */
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset);

Expand Down
1 change: 1 addition & 0 deletions programs/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ if(TEST_CPP)
)
add_executable(cpp_dummy_build "${cpp_dummy_build_cpp}")
set_base_compile_options(cpp_dummy_build)
target_compile_options(cpp_dummy_build PRIVATE -fmodules)
target_include_directories(cpp_dummy_build
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tf-psa-crypto/include
Expand Down