#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);