From b6dafeb612adb5b12dba78b0f12043f8ad9227a4 Mon Sep 17 00:00:00 2001 From: Peter Bigot Date: Mon, 12 Aug 2019 12:55:15 -0500 Subject: [PATCH] include/lvgl: 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 --- lib/gui/lvgl/lvgl_mem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gui/lvgl/lvgl_mem.h b/lib/gui/lvgl/lvgl_mem.h index 9b6c552a83b..845da5aaa10 100644 --- a/lib/gui/lvgl/lvgl_mem.h +++ b/lib/gui/lvgl/lvgl_mem.h @@ -7,12 +7,12 @@ #ifndef ZEPHYR_LIB_GUI_LVGL_MEM_H_ #define ZEPHYR_LIB_GUI_LVGL_MEM_H_ +#include + #ifdef __cplusplus extern "C" { #endif -#include - void *lvgl_malloc(size_t size); void lvgl_free(void *ptr);