From 3a6bcdfcb6d7979d9c7a1a2cc35b247c6934609c Mon Sep 17 00:00:00 2001 From: turtleletortue <46635000+turtleletortue@users.noreply.github.com> Date: Sun, 1 Sep 2019 11:42:14 -0400 Subject: [PATCH] Fix UINT32 issue for rs97 UINT32 is not recognized for rs97 so uint32 is used instead --- common/memory.c | 16 ++++++++-------- common/memory.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/memory.c b/common/memory.c index 2aa1c3f..8ff379a 100644 --- a/common/memory.c +++ b/common/memory.c @@ -17,15 +17,15 @@ typedef struct sMemBlockInfo { void *ptr; char *info; - UINT32 size; + uint32 size; struct sMemBlockInfo *next; struct sMemBlockInfo *prev; } sMemBlockInfo; sMemBlockInfo memoryInfo; -UINT32 memoryMaxAllocated; -UINT32 currentAllocatedMemory; -UINT32 maximumAllocatedMemory; +uint32 memoryMaxAllocated; +uint32 currentAllocatedMemory; +uint32 maximumAllocatedMemory; ////////////////////////////////////////////////////////////////////////////// // @@ -37,7 +37,7 @@ UINT32 maximumAllocatedMemory; // // ////////////////////////////////////////////////////////////////////////////// -void memory_addMemInfo(void *ptr, UINT32 size, char *info) +void memory_addMemInfo(void *ptr, uint32 size, char *info) { sMemBlockInfo *alias; @@ -83,7 +83,7 @@ void memory_init(void) // // ////////////////////////////////////////////////////////////////////////////// -void *memory_malloc(UINT32 size, char *info) +void *memory_malloc(uint32 size, char *info) { void *ptr; @@ -108,7 +108,7 @@ void *memory_malloc(UINT32 size, char *info) // // ////////////////////////////////////////////////////////////////////////////// -void memory_malloc_secure(void **new_ptr, UINT32 size, char *info) +void memory_malloc_secure(void **new_ptr, uint32 size, char *info) { void *ptr; @@ -137,7 +137,7 @@ void memory_malloc_secure(void **new_ptr, UINT32 size, char *info) void memory_memoryUsage(FILE *fp) { sMemBlockInfo *alias; - UINT32 total=0; + uint32 total=0; //fprintf(fp,"Memory usage:\n"); alias=&memoryInfo; diff --git a/common/memory.h b/common/memory.h index 7c4f684..917ad2b 100644 --- a/common/memory.h +++ b/common/memory.h @@ -20,8 +20,8 @@ void memory_init(void); void memory_done(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, char *info); +void *memory_malloc(uint32 size, char *info); void memory_free(void *ptr); void memory_memoryUsage(FILE *fp);