aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel/include
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-05-19 09:13:24 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-05-19 09:13:24 +0000
commit5e1249af266c9688ec575e5a2f14ecfe6084de49 (patch)
treecaa2477037b299f92860d734bf2750987478c8e4 /os/kernel/include
parent807c5f1882224c2afd471a44889b83c2adf80589 (diff)
downloadChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.tar.gz
ChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.tar.bz2
ChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.zip
Fixed bug 3303841.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include')
-rw-r--r--os/kernel/include/chheap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index eb642cd18..0db1cbc1d 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -76,7 +76,9 @@ struct memory_heap {
extern "C" {
#endif
void _heap_init(void);
+#if !CH_USE_MALLOC_HEAP
void chHeapInit(MemoryHeap *heapp, void *buf, size_t size);
+#endif
void *chHeapAlloc(MemoryHeap *heapp, size_t size);
void chHeapFree(void *p);
size_t chHeapStatus(MemoryHeap *heapp, size_t *sizep);