diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 08:10:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 08:10:15 -0600 |
| commit | 2a8958c4efcab8dcc8fda9cd31bdcf462801669d (patch) | |
| tree | 99ac8e3645a169c3f5fbebc21d9d36f59e297db3 /nuttx/include | |
| parent | 9fdb0a32f4dbd068171b04ae4428fcb74c9750af (diff) | |
| download | px4-nuttx-2a8958c4efcab8dcc8fda9cd31bdcf462801669d.tar.gz px4-nuttx-2a8958c4efcab8dcc8fda9cd31bdcf462801669d.tar.bz2 px4-nuttx-2a8958c4efcab8dcc8fda9cd31bdcf462801669d.zip | |
Need to condition out standard allocators in kernel build. More to be done
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/mm.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/include/nuttx/mm.h b/nuttx/include/nuttx/mm.h index 7eac6b930..50ad068f9 100644 --- a/nuttx/include/nuttx/mm.h +++ b/nuttx/include/nuttx/mm.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/nuttx/mm.h * - * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -65,10 +65,10 @@ # define CONFIG_MM_SMALL 1 #endif -#undef HAVE_USER_HEAP +#undef CONFIG_MM_USER_HEAP #if (!defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)) && \ !defined(CONFIG_BUILD_KERNEL) -# define HAVE_USER_HEAP +# define CONFIG_MM_USER_HEAP #endif /* Chunk Header Definitions *************************************************/ @@ -226,7 +226,7 @@ extern "C" #define EXTERN extern #endif -#ifdef HAVE_USER_HEAP +#ifdef CONFIG_MM_USER_HEAP /* This is the user heap */ EXTERN struct mm_heap_s g_mmheap; @@ -246,13 +246,13 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart, /* Functions contained in umm_initialize.c **********************************/ -#ifdef HAVE_USER_HEAP +#ifdef CONFIG_MM_USER_HEAP void umm_initialize(FAR void *heap_start, size_t heap_size); #endif /* Functions contained in umm_addregion.c ***********************************/ -#ifdef HAVE_USER_HEAP +#ifdef CONFIG_MM_USER_HEAP void umm_addregion(FAR void *heapstart, size_t heapsize); #endif @@ -265,7 +265,7 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap); /* Functions contained in umm_semaphore.c ***********************************/ -#ifdef HAVE_USER_HEAP +#ifdef CONFIG_MM_USER_HEAP int umm_trysemaphore(void); void umm_givesemaphore(void); #endif |