From 4914d0db3b1cae9d9763b57384db88b28aac88c3 Mon Sep 17 00:00:00 2001 From: Peter Bigot Date: Mon, 12 Aug 2019 12:55:24 -0500 Subject: [PATCH] samples/subsys/logging/logger: rearrange for standard use of extern "C" 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 --- samples/subsys/logging/logger/src/sample_module.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/subsys/logging/logger/src/sample_module.h b/samples/subsys/logging/logger/src/sample_module.h index 0a80a214a6b..6293793c944 100644 --- a/samples/subsys/logging/logger/src/sample_module.h +++ b/samples/subsys/logging/logger/src/sample_module.h @@ -6,10 +6,11 @@ #ifndef SAMPLE_MODULE_H #define SAMPLE_MODULE_H +#include + #ifdef __cplusplus extern "C" { #endif -#include #define MODULE_NAME sample_module