Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-07 06:15:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix several compile errors for logic added for CONFIG_BUILD_KERNEL, but which cause problems for other configurations

Browse source
This commit is contained in:
Gregory Nutt 2014-09-03 09:21:59 -06:00
parent ee96ed963c
commit 67d516d9d1
14 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/nuttx/mm.h
View file

@ -262,8 +262,8 @@ extern "C"
#define EXTERN extern
#endif
#if (!defined(CONFIG_ARCH_ADDRENV) || !defined(CONFIG_BUILD_KERNEL)) && \
(defined(CONFIG_BUILD_KERNEL) && !defined(__KERNEL__))
#if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \
(defined(CONFIG_BUILD_DEFINED) && !defined(__KERNEL__))
/* User heap structure:
*
* - Flat build: In the FLAT build, the user heap structure is a globally
@ -272,7 +272,7 @@ extern "C"
* in user space.
* - Kernel build: There are multiple heaps, one per process. The heap
* structure is associated with the address environment and there is
* no global user heap structure.
* no global user heap structure.
*/
EXTERN struct mm_heap_s g_mmheap;