Always put arena pointer in mem_arena_marker, to avoid possible DEBUG value discrepancy between lib and client code

ext/stb_image.h

@@ -484,13 +484,11 @@ STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
 #define STBI_NO_ZLIB
 #endif
 
-/*
 #include <stdarg.h>
 #include <stddef.h> // ptrdiff_t on osx
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-*/
 
 #if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
 #include <math.h>  // ldexp, pow

src/platform/platform_strings.h

@@ -22,7 +22,6 @@
 
 #else
 	#include<string.h>
-	#include<stdio.h>
 #endif
 
 #endif //__PLATFORM_STRINGS_H_

src/util/memory.c

@@ -117,11 +117,9 @@ void mem_arena_clear(mem_arena* arena)
 
 mem_arena_marker mem_arena_mark(mem_arena* arena)
 {
-	mem_arena_marker marker = {.chunk = arena->currentChunk,
+	mem_arena_marker marker = {.arena = arena,
+	                           .chunk = arena->currentChunk,
 	                           .offset = arena->currentChunk->offset};
-	#if DEBUG
-		marker.arena = arena;
-	#endif
 	return(marker);
 }
 

src/util/memory.h

@@ -40,9 +40,7 @@ typedef struct mem_arena
 
 typedef struct mem_arena_marker
 {
-	#if DEBUG
 	mem_arena* arena;
-	#endif
 	mem_arena_chunk* chunk;
 	u64 offset;
 } mem_arena_marker;