From 277e4af4fa9e80816c809542d792ee6bebb7f202 Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Fri, 4 May 2012 20:06:37 +0200 Subject: Migration to C++! --- src/kernel/mem/mem.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/kernel/mem/mem.h') diff --git a/src/kernel/mem/mem.h b/src/kernel/mem/mem.h index cb9c396..085d9ce 100644 --- a/src/kernel/mem/mem.h +++ b/src/kernel/mem/mem.h @@ -11,19 +11,17 @@ void* kmalloc_page(size_t *phys); void kfree_page(void* page); // Internal, used by dlmalloc -void* ksbrk(size_t size); -void kbrk(void* ptr); +extern "C" void* ksbrk(size_t size); +extern "C" void kbrk(void* ptr); #define kmalloc dlmalloc #define kfree dlfree -void kheap_init(); - -extern int _no_more_ksbrk; +extern bool _no_more_ksbrk; extern size_t mem_placementAddr; -extern void end; //Symbol defined by linker : end of kernel code +extern "C" size_t end; //Symbol defined by linker : end of kernel code -extern void k_highhalf_addr; // Symbol defined by linker : high half position of the kerne +extern "C" size_t k_highhalf_addr; // Symbol defined by linker : high half position of the kerne // Should be at 0xC0000000 #define K_HIGHHALF_ADDR ((size_t)(&k_highhalf_addr)) -- cgit v1.2.3