aboutsummaryrefslogtreecommitdiff
path: root/zencore/include
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-09-09 15:24:26 +0200
committerMartin Ridgers <[email protected]>2021-09-14 14:29:28 +0200
commit1ce0bd35b665df14b94ff0dc6c77e46aca48b7cc (patch)
treeef8ae2ee53943470ae283b826695d1636041bd85 /zencore/include
parentIsPointerToStack() implementation for Linux (diff)
downloadzen-1ce0bd35b665df14b94ff0dc6c77e46aca48b7cc.tar.xz
zen-1ce0bd35b665df14b94ff0dc6c77e46aca48b7cc.zip
Added #if/endif around a check if 'min' is defined
Diffstat (limited to 'zencore/include')
-rw-r--r--zencore/include/zencore/intmath.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/zencore/include/zencore/intmath.h b/zencore/include/zencore/intmath.h
index f5b9361d7..90b7cf9f6 100644
--- a/zencore/include/zencore/intmath.h
+++ b/zencore/include/zencore/intmath.h
@@ -159,8 +159,10 @@ IsPointerAligned(const void* Ptr, uint64_t Alignment)
//////////////////////////////////////////////////////////////////////////
-#ifdef min
-# error "Looks like you did #include <windows.h> -- use <zencore/windows.h> instead"
+#if ZEN_PLATFORM_WINDOWS
+# ifdef min
+# error "Looks like you did #include <windows.h> -- use <zencore/windows.h> instead"
+# endif
#endif
constexpr auto