From e7e79a6ccb4f3e320b2b8b7bad1b14d65218641d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Mar 2011 18:38:08 +0000
Subject: License updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2827 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/include/chheap.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'os/kernel/include/chheap.h')

diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index 1c5ec5419..ed5fa252a 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
-- 
cgit v1.2.3


From f5ae2552307f20f3fa3d987591fa60576981ce3d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 29 Mar 2011 14:51:08 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2850
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/include/chheap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'os/kernel/include/chheap.h')

diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index ed5fa252a..eb642cd18 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -75,7 +75,7 @@ struct memory_heap {
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void heap_init(void);
+  void _heap_init(void);
   void chHeapInit(MemoryHeap *heapp, void *buf, size_t size);
   void *chHeapAlloc(MemoryHeap *heapp, size_t size);
   void chHeapFree(void *p);
-- 
cgit v1.2.3


From 5e1249af266c9688ec575e5a2f14ecfe6084de49 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 19 May 2011 09:13:24 +0000
Subject: Fixed bug 3303841.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/include/chheap.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'os/kernel/include/chheap.h')

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);
-- 
cgit v1.2.3