From 7e30657f54d49c074a6fe98e6c95600380384fbf Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 18 Jul 2017 09:59:23 -0400
Subject: [PATCH] Attempt to fix compilation against the latest Windows SDK.

---
 src/platform_windows.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/platform_windows.c b/src/platform_windows.c
index d96ce99..e1fa2d7 100644
--- a/src/platform_windows.c
+++ b/src/platform_windows.c
@@ -17,6 +17,9 @@
 #undef UNICODE
 #endif
 
+/* !!! FIXME: maybe clean out the "allocator" macro, eventually. */
+#undef allocator  /* apparently Windows 10 SDK conflicts here. */
+
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 #include <userenv.h>
@@ -26,6 +29,11 @@
 #include <ctype.h>
 #include <time.h>
 
+#ifdef allocator  /* apparently Windows 10 SDK conflicts here. */
+#undef allocator
+#endif
+#define allocator __PHYSFS_AllocatorHooks
+
 #define LOWORDER_UINT64(pos) ((PHYSFS_uint32) (pos & 0xFFFFFFFF))
 #define HIGHORDER_UINT64(pos) ((PHYSFS_uint32) ((pos >> 32) & 0xFFFFFFFF))