From 1d412701d1297df2b6d4dffb259c68fe664a19fa Mon Sep 17 00:00:00 2001
From: SupSuper
Date: Sun, 16 Dec 2018 23:03:03 +0000
Subject: WIN32: Always include windows.h before util.h

This avoids Windows trying to stomp our definition of ARRAYSIZE
---
 backends/fs/windows/windows-fs-factory.cpp | 2 +-
 backends/fs/windows/windows-fs.h           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'backends/fs')

diff --git a/backends/fs/windows/windows-fs-factory.cpp b/backends/fs/windows/windows-fs-factory.cpp
index 9d1b13a0c9..86f28a7e4b 100644
--- a/backends/fs/windows/windows-fs-factory.cpp
+++ b/backends/fs/windows/windows-fs-factory.cpp
@@ -25,8 +25,8 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "backends/fs/windows/windows-fs-factory.h"
 #include "backends/fs/windows/windows-fs.h"
+#include "backends/fs/windows/windows-fs-factory.h"
 
 AbstractFSNode *WindowsFilesystemFactory::makeRootFileNode() const {
 	return new WindowsFilesystemNode();
diff --git a/backends/fs/windows/windows-fs.h b/backends/fs/windows/windows-fs.h
index 4be4cbf57e..f907a4d047 100644
--- a/backends/fs/windows/windows-fs.h
+++ b/backends/fs/windows/windows-fs.h
@@ -23,12 +23,13 @@
 #ifndef WINDOWS_FILESYSTEM_H
 #define WINDOWS_FILESYSTEM_H
 
-#include "backends/fs/abstract-fs.h"
-
 #include <windows.h>
 #ifdef _WIN32_WCE
 #undef GetCurrentDirectory
 #endif
+
+#include "backends/fs/abstract-fs.h"
+
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3