summaryrefslogtreecommitdiff
path: root/Source/Library
diff options
context:
space:
mode:
authorNicolas BERNSTEIN <katchup@nicolas-bernsteins-acpi.local>2009-10-26 14:42:00 +0100
committerNicolas BERNSTEIN <katchup@nicolas-bernsteins-acpi.local>2009-10-26 14:42:00 +0100
commitd68a064819deaaa8e01eca3c7809050b25cedfbd (patch)
tree2d4692602b7ad7e1071b9b0a83a11d44181bafa0 /Source/Library
parentd1ac6fb03e3110e35023f60f643f0c4d02c3d8b6 (diff)
downloadMelon-d68a064819deaaa8e01eca3c7809050b25cedfbd.tar.gz
Melon-d68a064819deaaa8e01eca3c7809050b25cedfbd.zip
Made some minor changes, for compatibility
Diffstat (limited to 'Source/Library')
-rw-r--r--Source/Library/Common/types.h1
-rw-r--r--Source/Library/Userland/common.h8
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Library/Common/types.h b/Source/Library/Common/types.h
index ca6f73d..de3be24 100644
--- a/Source/Library/Common/types.h
+++ b/Source/Library/Common/types.h
@@ -12,6 +12,7 @@ typedef long long s64int;
typedef int s32int;
typedef short s16int;
typedef char s8int;
+typedef unsigned long size_t;
#define U64 unsigned long long
#define S64 long long
diff --git a/Source/Library/Userland/common.h b/Source/Library/Userland/common.h
index 6257841..679afd0 100644
--- a/Source/Library/Userland/common.h
+++ b/Source/Library/Userland/common.h
@@ -14,13 +14,13 @@ namespace Mem {
}
//Standard implemenations of operator new/delete
-inline void* operator new(u32int, void *p) { return p; }
-inline void* operator new[](u32int, void *p) { return p; }
+inline void* operator new(size_t, void *p) { return p; }
+inline void* operator new[](size_t, void *p) { return p; }
inline void operator delete(void*, void*) { }
inline void operator delete[](void*, void*) { }
-inline void* operator new(u32int sz) { return Mem::alloc(sz); }
-inline void* operator new[](u32int sz) { return Mem::alloc(sz); }
+inline void* operator new(size_t sz) { return Mem::alloc(sz); }
+inline void* operator new[](size_t sz) { return Mem::alloc(sz); }
inline void operator delete(void *ptr) { Mem::free(ptr); }
inline void operator delete[](void *ptr) { Mem::free(ptr); }