michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/x86: rearrange for standard use of extern "C"

Browse source 
Consistently place C++ use of extern "C" after all include directives,
within the negative branch of _ASMLANGUAGE if used.

Background from issue #17997:

Declarations that use C linkage should be placed within extern "C"
so the language linkage is correct when the header is included by
a C++ compiler.

Similarly #include directives should be outside the extern "C" to
ensure the language-specific default linkage is applied to any
declarations provided by the included header.

See: https://en.cppreference.com/w/cpp/language/language_linkage
Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2019-08-12 15:54:24 -05:00 • committed by Ioannis Glaropoulos
commit 324203f79b
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/include/ia32/kernel_arch_func.h
View file

@ -12,6 +12,8 @@
#ifndef _ASMLANGUAGE
#include <stddef.h> /* For size_t */
#ifdef __cplusplus
extern "C" {
#endif
@ -92,8 +94,6 @@ static inline struct x86_mmu_pdpt *z_x86_pdpt_get(struct k_thread *thread)
/* ASM code to fiddle with registers to enable the MMU with PAE paging */
void z_x86_enable_paging(void);
#include <stddef.h> /* For size_t */
#ifdef __cplusplus
}
#endif