diff options
| author | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-17 13:30:09 +0200 |
|---|---|---|
| committer | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-17 13:30:09 +0200 |
| commit | 7c9a48b4e6d66cf4f62e7bad9e22ab06923e47ef (patch) | |
| tree | df44a926f105c913c77525d35441d20a632f1440 /src/kernel/mem | |
| parent | c6d35a5f4fdda6ae2e98498f19a4adaee6d95692 (diff) | |
| download | TCE-7c9a48b4e6d66cf4f62e7bad9e22ab06923e47ef.tar.gz TCE-7c9a48b4e6d66cf4f62e7bad9e22ab06923e47ef.zip | |
Beginning of a VFS implemented. C++ is great.
Diffstat (limited to 'src/kernel/mem')
| -rw-r--r-- | src/kernel/mem/_dlmalloc.h | 2 | ||||
| -rw-r--r-- | src/kernel/mem/mem.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/mem/_dlmalloc.h b/src/kernel/mem/_dlmalloc.h index a80273c..23682be 100644 --- a/src/kernel/mem/_dlmalloc.h +++ b/src/kernel/mem/_dlmalloc.h @@ -12,7 +12,7 @@ #define LACKS_SYS_PARAM_H #define LACKS_STDLIB_H -#define USE_DL_PREFIX +// #define USE_DL_PREFIX #define USE_LOCKS 2 diff --git a/src/kernel/mem/mem.h b/src/kernel/mem/mem.h index 085d9ce..4201983 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 dlmalloc -#define kfree dlfree +#define kmalloc malloc +#define kfree free extern bool _no_more_ksbrk; extern size_t mem_placementAddr; |