Merge two at91sam7 project.

[bertos.git] / bertos / struct / heap.c

diff --git a/bertos/struct/heap.c b/bertos/struct/heap.c
index b4380a4da499a53e4c6cc581e755667df8867279..dc8ceaab8e03df4cc2916ecaba936027277153d8 100644 (file)
--- a/bertos/struct/heap.c
+++ b/bertos/struct/heap.c
@@ -32,7 +32,7 @@
  *
  * \brief Heap subsystem (public interface).
  *
- * \version $Id: heap.c 1532 2008-08-04 07:21:26Z bernie $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
@@ -73,7 +73,7 @@ void *heap_allocmem(struct Heap* h, size_t size)
        MemChunk *chunk, *prev;
 
        /* Round size up to the allocation granularity */
-       size = ROUND2(size, sizeof(MemChunk));
+       size = ROUND_UP2(size, sizeof(MemChunk));
 
        /* Handle allocations of 0 bytes */
        if (!size)
@@ -123,7 +123,7 @@ void heap_freemem(struct Heap* h, void *mem, size_t size)
 #endif
 
        /* Round size up to the allocation granularity */
-       size = ROUND2(size, sizeof(MemChunk));
+       size = ROUND_UP2(size, sizeof(MemChunk));
 
        /* Handle allocations of 0 bytes */
        if (!size)