From dfa7ce5c94c5af88cd0cb87ebf7f0e7944fa9f9a Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Sun, 22 Jan 2017 17:06:05 -0500 Subject: [PATCH] kernel: include kernel.h in kernel_structs.h in asm files This will be needed for some thread user options that will move to kernel.h since they are part of the user API. Change-Id: I46e302b6cafcdddbad3458134b98feb5b8d45d9b Signed-off-by: Benjamin Walsh --- include/kernel.h | 3 +++ kernel/include/kernel_structs.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/kernel.h b/include/kernel.h index 46a31db501a..59c57a82642 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -13,6 +13,7 @@ #ifndef _kernel__h_ #define _kernel__h_ +#if !defined(_ASMLANGUAGE) #include #include #include @@ -3145,4 +3146,6 @@ inline void *operator new[](size_t size, void *ptr) #endif /* defined(CONFIG_CPLUSPLUS) && defined(__cplusplus) */ +#endif /* !_ASMLANGUAGE */ + #endif /* _kernel__h_ */ diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h index f0f55cdb7e2..a00754eda37 100644 --- a/kernel/include/kernel_structs.h +++ b/kernel/include/kernel_structs.h @@ -7,8 +7,9 @@ #ifndef _kernel_structs__h_ #define _kernel_structs__h_ -#if !defined(_ASMLANGUAGE) #include + +#if !defined(_ASMLANGUAGE) #include #include #endif