diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/common/profiler.cpp | |
| parent | Merge pull request #695 from Subv/crash_f (diff) | |
| parent | Fix printf format warning (diff) | |
| download | yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.gz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.xz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.zip | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/common/profiler.cpp')
| -rw-r--r-- | src/common/profiler.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp index 65c3df167..b8cde1785 100644 --- a/src/common/profiler.cpp +++ b/src/common/profiler.cpp | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include "common/assert.h" | 7 | #include "common/assert.h" |
| 8 | 8 | ||
| 9 | #if defined(_MSC_VER) && _MSC_VER <= 1800 // MSVC 2013. | 9 | #if defined(_MSC_VER) && _MSC_VER <= 1800 // MSVC 2013. |
| 10 | #define NOMINMAX | ||
| 11 | #define WIN32_LEAN_AND_MEAN | 10 | #define WIN32_LEAN_AND_MEAN |
| 12 | #include <Windows.h> // For QueryPerformanceCounter/Frequency | 11 | #include <Windows.h> // For QueryPerformanceCounter/Frequency |
| 13 | #endif | 12 | #endif |