aboutsummaryrefslogtreecommitdiff
path: root/zencore/memory.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-10-15 16:29:38 +0200
committerStefan Boberg <[email protected]>2021-10-15 16:29:38 +0200
commitbb258b7bf62c5021d2ccde38107efcfdfc52ddd0 (patch)
tree6d641ac4ecc04373e19a9c80776a47ba5b590eaf /zencore/memory.cpp
parentzencore: added ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END (diff)
downloadzen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.tar.xz
zen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.zip
zencore: Enabled MSC warning 4668 to get warnings when preprocessor macros are used without an explicit definition
Also fixed up various code to compile with this, by using ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END macros Removed prewindows.h/postwindows.h since they are no longer to be used due to the above
Diffstat (limited to 'zencore/memory.cpp')
-rw-r--r--zencore/memory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index da78ae3a8..62c81076d 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -6,7 +6,9 @@
#ifdef ZEN_PLATFORM_WINDOWS
# include <malloc.h>
+ZEN_THIRD_PARTY_INCLUDES_START
# include <mimalloc.h>
+ZEN_THIRD_PARTY_INCLUDES_END
#else
# include <cstdlib>
#endif