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 | 7993d67ca9b066ebcd6b15a5cc6e6bbed941fcc2 (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/common/timer.cpp | |
| parent | 6aa68fe8daf7be4da9bb5340db5c9673c77d262d (diff) | |
| parent | 305cc20144eedf713111109b12398acf191aed38 (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 e843cbd9c3..c9803109e7 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 |