Ver código fonte

Attempt to fix compilation against the latest Windows SDK.

Ryan C. Gordon 8 anos atrás
pai
commit
7e30657f54
1 arquivos alterados com 8 adições e 0 exclusões
  1. 8 0
      src/platform_windows.c

+ 8 - 0
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))