aboutsummaryrefslogtreecommitdiff
path: root/zencore/memory.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-09-15 10:26:36 +0200
committerMartin Ridgers <[email protected]>2021-09-15 10:29:52 +0200
commit072bdd1ceaa99a06a3cb75658f3f6d3b80e6984e (patch)
tree9dbd3311cce64fe35481f8a28bc3914a0043fc24 /zencore/memory.cpp
parentFixed GetSize() constexpr compile errors with GCC (diff)
downloadzen-072bdd1ceaa99a06a3cb75658f3f6d3b80e6984e.tar.xz
zen-072bdd1ceaa99a06a3cb75658f3f6d3b80e6984e.zip
Correct platform-specific _mm_malloc/aligned_alloc includes
Diffstat (limited to 'zencore/memory.cpp')
-rw-r--r--zencore/memory.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index 25a8d4761..9c7fb8333 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -1,9 +1,14 @@
// Copyright Epic Games, Inc. All Rights Reserved.
-#include <malloc.h>
#include <zencore/intmath.h>
#include <zencore/memory.h>
+#ifdef ZEN_PLATFORM_WINDOWS
+# include <malloc.h>
+#else
+# include <cstdlib>
+#endif
+
#include <doctest/doctest.h>
namespace zen {