aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2016-01-11 08:03:16 +0100
committerJoel Bodenmann <joel@seriouslyembedded.com>2016-01-11 08:03:16 +0100
commita76c17684096b82225be269f32edb0a228909893 (patch)
tree2ad02971dc7954873827988c8fd8e2f789f5302a /src
parent1ad99cbe4a3629e0460ef484c3eef6b177cedd9b (diff)
downloaduGFX-a76c17684096b82225be269f32edb0a228909893.tar.gz
uGFX-a76c17684096b82225be269f32edb0a228909893.tar.bz2
uGFX-a76c17684096b82225be269f32edb0a228909893.zip
Revert "Setting the default heap size to 5120 bytes to avoid confusion due to linker errors when no malloc() / free() are available"
This reverts commit ed9a422d81994047edc59794ff26bbcc1f7ea6c5.
Diffstat (limited to 'src')
-rw-r--r--src/gos/gos_options.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h
index c61b407f..0c6fd7a7 100644
--- a/src/gos/gos_options.h
+++ b/src/gos/gos_options.h
@@ -182,7 +182,7 @@
#endif
/**
* @brief How much RAM should uGFX use for the heap when using its own internal heap allocator
- * @details Defaults to 5120.
+ * @details Defaults to 0.
* @note Only used when the internal ugfx heap allocator is used
* (GFX_USE_OS_RAW32, GFX_USE_OS_ARDUINO, GFX_US_OS_KEIL, GFX_USE_OS_CMSIS)
* @note If 0 then the standard C runtime malloc(), free() and realloc()
@@ -193,7 +193,7 @@
* is added allowing the user to add extra memory blocks to the heap.
*/
#ifndef GFX_OS_HEAP_SIZE
- #define GFX_OS_HEAP_SIZE 5120
+ #define GFX_OS_HEAP_SIZE 0
#endif
/** @} */