diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/common/timer.cpp | |
| parent | 77fd4f42376c115d0082dbc8fed6b3ed588f37bf (diff) | |
| parent | 0aee903adab317a11209aed4f4cb176cf62ca6d9 (diff) | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/common/timer.cpp')
| -rw-r--r-- | src/common/timer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/timer.cpp b/src/common/timer.cpp index e843cbd9c..c9803109e 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -4,7 +4,8 @@ #include <time.h> #ifdef _WIN32 -#include <Windows.h> +#include <windows.h> +// windows.h needs to be included before other windows headers #include <mmsystem.h> #include <sys/timeb.h> #else |