Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 27 deletions

diff --git a/arm9/lib/include/OS_alloc.h b/arm9/lib/include/OS_alloc.h
index 5ee95395..e73c2971 100644
--- a/arm9/lib/include/OS_alloc.h
+++ b/arm9/lib/include/OS_alloc.h
@@ -1,32 +1,9 @@
-#ifndef POKEDIAMOND_OS_ALLOC_H
-#define POKEDIAMOND_OS_ALLOC_H
+#ifndef POKEDIAMOND_ARM9_OS_ALLOC_H
+#define POKEDIAMOND_ARM9_OS_ALLOC_H
 
 #include "nitro/types.h"
 #include "OS_arena.h"
-
-typedef int OSHeapHandle;
-
-typedef struct Cell Cell;
-
-struct Cell {
-    Cell* prev;
-    Cell* next;
-    long size;
-};
-
-typedef struct {
-    long size;
-    Cell *free;
-    Cell *allocated;
-} HeapDesc;
-
-typedef struct {
-    volatile OSHeapHandle currentHeap;
-    int numHeaps;
-    void* arenaStart;
-    void* arenaEnd;
-    HeapDesc* heapArray;
-} OSHeapInfo;
+#include "nitro/OS_alloc_shared.h"
 
 Cell* DLAddFront(Cell* list, Cell* cell);
 Cell* DLExtract(Cell* list, Cell* cell);
@@ -34,4 +11,4 @@ Cell *DLInsert(Cell *original, Cell *inserted);
 void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size);
 void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void *ptr);
 
-#endif //POKEDIAMOND_OS_ALLOC_H
+#endif //POKEDIAMOND_ARM9_OS_ALLOC_H