diff --git a/ext/stb_image.h b/ext/stb_image.h index 976710f..7bbb0e4 100644 --- a/ext/stb_image.h +++ b/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 #include // ptrdiff_t on osx #include #include #include -*/ #if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) #include // ldexp, pow diff --git a/src/platform/platform_strings.h b/src/platform/platform_strings.h index 96259cb..90b203b 100644 --- a/src/platform/platform_strings.h +++ b/src/platform/platform_strings.h @@ -22,7 +22,6 @@ #else #include - #include #endif #endif //__PLATFORM_STRINGS_H_ diff --git a/src/util/memory.c b/src/util/memory.c index a6586fa..34096f2 100644 --- a/src/util/memory.c +++ b/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); } diff --git a/src/util/memory.h b/src/util/memory.h index 7ef6d63..5df2104 100644 --- a/src/util/memory.h +++ b/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* arena; mem_arena_chunk* chunk; u64 offset; } mem_arena_marker;