Moved *actual* files into source tree...

[virtualjaguar] / src / memory.h

diff --git a/src/memory.h b/src/memory.h
index 5e922de99e05de2ab036119f22e5d8cdb4ca92b2..5ea70d938630a74ff2e5f2b967995535897ae7d6 100644 (file)
--- a/src/memory.h
+++ b/src/memory.h
@@ -5,16 +5,14 @@
 #ifndef __MEMORY_H__
 #define __MEMORY_H__
 
-#include <stdio.h>
-//#include <stdlib.h>
-//#include <malloc.h>
+#include <stdio.h>                                                             // For FILE struct
 #include "types.h"
-//#include "log.h"
 
-void InitMemory(void);
+void MemoryInit(void);
 void MemoryDone(void);
-void memory_malloc_secure(void ** new_ptr, uint32 size, char * info);
-void * memory_malloc(uint32 size, char * info);
+void memory_malloc_secure(void ** new_ptr, uint32 size, const char * info);
+//void * memory_malloc_secure2(uint32 size, const char * info);
+void * memory_malloc(uint32 size, const char * info);
 void memory_free(void * ptr);
 void memory_memoryUsage(FILE * fp);