Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Attempt to fix compilation against the latest Windows SDK.
  • Loading branch information
icculus committed Jul 18, 2017
1 parent adb7ea4 commit 7e30657
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/platform_windows.c
Expand Up @@ -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>
Expand All @@ -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))

Expand Down

0 comments on commit 7e30657

Please sign in to comment.