diff options
| author | SupSuper | 2018-12-16 23:03:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2018-12-17 12:28:33 +0200 |
| commit | 1d412701d1297df2b6d4dffb259c68fe664a19fa (patch) | |
| tree | 6997e06b385bacbb45f2872197f7e5cc6ec58e04 /backends | |
| parent | 272d4105b274391427f92b25b80cbfe68c7997db (diff) | |
| download | scummvm-rg350-1d412701d1297df2b6d4dffb259c68fe664a19fa.tar.gz scummvm-rg350-1d412701d1297df2b6d4dffb259c68fe664a19fa.tar.bz2 scummvm-rg350-1d412701d1297df2b6d4dffb259c68fe664a19fa.zip | |
WIN32: Always include windows.h before util.h
This avoids Windows trying to stomp our definition of ARRAYSIZE
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/fs/windows/windows-fs-factory.cpp | 2 | ||||
| -rw-r--r-- | backends/fs/windows/windows-fs.h | 5 |
2 files changed, 4 insertions, 3 deletions
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> |