diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-11-15 19:15:27 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-11-17 09:16:17 +0100 |
commit | 32cee88357546ca4c3352b1691b05059f086bf74 (patch) | |
tree | 6056ea9f2e9f59898cd778277de25f9e7827cf56 /cpukit/include/rtems/confdefs/malloc.h | |
parent | build: Add --rtems-version command line option (diff) | |
download | rtems-32cee88357546ca4c3352b1691b05059f086bf74.tar.bz2 |
config: CONFIGURE_DISABLE_BSP_SETTINGS
Evaluate CONFIGURE_DISABLE_BSP_SETTINGS for each affected application
configuration option. This makes the code easier to review since the influence
of CONFIGURE_DISABLE_BSP_SETTINGS is locally visible in the code.
Update #3875.
Diffstat (limited to '')
-rw-r--r-- | cpukit/include/rtems/confdefs/malloc.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cpukit/include/rtems/confdefs/malloc.h b/cpukit/include/rtems/confdefs/malloc.h index d864a98270..a8dae6e739 100644 --- a/cpukit/include/rtems/confdefs/malloc.h +++ b/cpukit/include/rtems/confdefs/malloc.h @@ -45,8 +45,12 @@ #include <rtems/confdefs/bsp.h> -#if defined(CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK) \ - || defined(CONFIGURE_MALLOC_DIRTY) +#if !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && \ + defined(CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK) +#define _CONFIGURE_HEAP_EXTEND_VIA_SBRK +#endif + +#if defined(_CONFIGURE_HEAP_EXTEND_VIA_SBRK) || defined(CONFIGURE_MALLOC_DIRTY) #include <rtems/malloc.h> #endif @@ -54,7 +58,7 @@ extern "C" { #endif -#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK +#ifdef _CONFIGURE_HEAP_EXTEND_VIA_SBRK const rtems_heap_extend_handler rtems_malloc_extend_handler = rtems_heap_extend_via_sbrk; #endif |