diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-13 18:50:28 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-13 18:50:28 -0700 |
| commit | 0d7381ba408e4d5bcde06ab7a6353ff14e7afc0b (patch) | |
| tree | 293a786398d109ca316fc89d2f128fd80d7d5f56 /toolsrc/include/pch.h | |
| parent | 2397cc044ee56160757aeb402dc7adaec6b00894 (diff) | |
| parent | a790820e8cdf9adca3e5cf066b8a563a3beaacd1 (diff) | |
| download | vcpkg-0d7381ba408e4d5bcde06ab7a6353ff14e7afc0b.tar.gz vcpkg-0d7381ba408e4d5bcde06ab7a6353ff14e7afc0b.zip | |
Merge branch 'refactor-includes'
Diffstat (limited to 'toolsrc/include/pch.h')
| -rw-r--r-- | toolsrc/include/pch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index 0f34063f8..8333eb927 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -2,9 +2,13 @@ #define NOMINMAX #define WIN32_LEAN_AND_MEAN + #pragma warning(suppress : 4768) #include <windows.h> +#pragma warning(suppress : 4768) +#include <Shlobj.h> + #include <algorithm> #include <array> #include <atomic> @@ -28,10 +32,6 @@ #include <regex> #include <set> #include <shellapi.h> -#pragma warning(push) -#pragma warning(disable : 4768) -#include <Shlobj.h> -#pragma warning(pop) #include <stdexcept> #include <string> #include <sys/timeb.h> |