diff options
Diffstat (limited to 'Source/Library/Common')
-rw-r--r-- | Source/Library/Common/Heap.class.cpp | 2 | ||||
-rw-r--r-- | Source/Library/Common/Heap.class.h | 6 | ||||
-rw-r--r-- | Source/Library/Common/types.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/Library/Common/Heap.class.cpp b/Source/Library/Common/Heap.class.cpp index 34e4dc4..45a3669 100644 --- a/Source/Library/Common/Heap.class.cpp +++ b/Source/Library/Common/Heap.class.cpp @@ -137,7 +137,7 @@ void Heap::contract() { //Automatically work out how much we can contract m_end = newEnd; } -void *Heap::alloc(u32int sz, bool no_expand) { +void *Heap::alloc(size_t sz, bool no_expand) { m_mutex.waitLock(); u32int newsize = sz + sizeof(heap_header_t) + sizeof(heap_footer_t); diff --git a/Source/Library/Common/Heap.class.h b/Source/Library/Common/Heap.class.h index f5895c7..131aef3 100644 --- a/Source/Library/Common/Heap.class.h +++ b/Source/Library/Common/Heap.class.h @@ -12,7 +12,7 @@ struct heap_header_t { u32int magic; bool is_hole; - u32int size; + size_t size; }; struct heap_footer_t { @@ -22,7 +22,7 @@ struct heap_footer_t { struct heap_index_t { heap_header_t **data; - u32int size; + size_t size; }; #ifdef THIS_IS_MELON_KERNEL @@ -63,7 +63,7 @@ class Heap { void create(u32int start, u32int size, u32int idxsize); #endif - void* alloc(u32int sz, bool no_expand = false); + void* alloc(size_t sz, bool no_expand = false); void free(void* ptr); bool usable() { diff --git a/Source/Library/Common/types.h b/Source/Library/Common/types.h index de3be24..843a8ca 100644 --- a/Source/Library/Common/types.h +++ b/Source/Library/Common/types.h @@ -12,7 +12,7 @@ typedef long long s64int; typedef int s32int; typedef short s16int; typedef char s8int; -typedef unsigned long size_t; +typedef unsigned int size_t; #define U64 unsigned long long #define S64 long long |