From f3e03796652b792bb3fd5d3d25b687b9a7f14633 Mon Sep 17 00:00:00 2001
From: Alex AUVOLAT <alexis211@gmail.com>
Date: Fri, 18 May 2012 11:25:25 +0200
Subject: A bit of a change in the directory layout.

---
 src/kernel/mem/_dlmalloc.h | 5 ++---
 src/kernel/mem/gdt.cpp     | 2 +-
 src/kernel/mem/mem.h       | 4 ++--
 src/kernel/mem/paging.cpp  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/kernel/mem')

diff --git a/src/kernel/mem/_dlmalloc.h b/src/kernel/mem/_dlmalloc.h
index 23682be..b171ef1 100644
--- a/src/kernel/mem/_dlmalloc.h
+++ b/src/kernel/mem/_dlmalloc.h
@@ -3,16 +3,15 @@
 
 #include <types.h>
 #include "lib/std.h"
-#include <stdlib_common.h>
-#include <string.h>
 
 #define NO_MALLOC_STATS 1
 #define LACKS_TIME_H
 #define LACKS_UNISTD_H
 #define LACKS_SYS_PARAM_H
 #define LACKS_STDLIB_H
+#define LACKS_STRING_H
 
-// #define USE_DL_PREFIX
+#define USE_DL_PREFIX
 
 #define USE_LOCKS 2
 
diff --git a/src/kernel/mem/gdt.cpp b/src/kernel/mem/gdt.cpp
index cca1767..1cac335 100644
--- a/src/kernel/mem/gdt.cpp
+++ b/src/kernel/mem/gdt.cpp
@@ -1,5 +1,5 @@
 #include "gdt.h"
-#include <stdlib_common.h>
+#include <lib/std.h>
 
 extern "C" void gdt_flush(uint32_t);	//ASM (imported from idt_.asm)
 extern "C" void tss_flush();
diff --git a/src/kernel/mem/mem.h b/src/kernel/mem/mem.h
index 4201983..085d9ce 100644
--- a/src/kernel/mem/mem.h
+++ b/src/kernel/mem/mem.h
@@ -14,8 +14,8 @@ void kfree_page(void* page);
 extern "C" void* ksbrk(size_t size);
 extern "C" void kbrk(void* ptr);
 
-#define kmalloc malloc
-#define kfree free
+#define kmalloc dlmalloc
+#define kfree dlfree
 
 extern bool _no_more_ksbrk;
 extern size_t mem_placementAddr;
diff --git a/src/kernel/mem/paging.cpp b/src/kernel/mem/paging.cpp
index a6daf68..03c6e2d 100644
--- a/src/kernel/mem/paging.cpp
+++ b/src/kernel/mem/paging.cpp
@@ -1,11 +1,11 @@
 #include "paging.h"
 #include <bitset.h>
-#include <stdlib_common.h>
 #include "mem.h"
 #include "seg.h"
 #include <core/sys.h>
 #include <task/task.h>
 #include <ui/vt.h>
+#include <lib/std.h>
 
 static bitset frames;
 
-- 
cgit v1.2.3