diff options
Diffstat (limited to 'cpukit/include/rtems/confdefs/malloc.h')
| -rw-r--r-- | cpukit/include/rtems/confdefs/malloc.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpukit/include/rtems/confdefs/malloc.h b/cpukit/include/rtems/confdefs/malloc.h index d864a98270..a20c6a290e 100644 --- a/cpukit/include/rtems/confdefs/malloc.h +++ b/cpukit/include/rtems/confdefs/malloc.h @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * Copyright (C) 2020 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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 |