diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-05-20 10:10:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 10:10:26 -0700 |
| commit | 9d9a50bc9823ca1673019aa18f23d28c7a1d2ff9 (patch) | |
| tree | 54c5f724a2cc2414dfb1978edeb4dd201b50ba51 /toolsrc/include/pch.h | |
| parent | 9b4535e7ee7673fb8515d1f4f256990423a0d952 (diff) | |
| download | vcpkg-9d9a50bc9823ca1673019aa18f23d28c7a1d2ff9.tar.gz vcpkg-9d9a50bc9823ca1673019aa18f23d28c7a1d2ff9.zip | |
[vcpkg] fix extern C around ctermid (#11343)
Additionally, move the system_header invocations to their own header file,
<vcpkg/base/system_header.h>
Diffstat (limited to 'toolsrc/include/pch.h')
| -rw-r--r-- | toolsrc/include/pch.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index 03e3f59f7..e23230f6e 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -1,22 +1,12 @@ #pragma once #include <vcpkg/base/pragmas.h> +#include <vcpkg/base/system_headers.h> #if defined(_WIN32) -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN - -#pragma warning(suppress : 4768) -#include <windows.h> - -#pragma warning(suppress : 4768) -#include <Shlobj.h> - #include <process.h> #include <shellapi.h> #include <winhttp.h> -#else -#include <unistd.h> #endif #include <algorithm> @@ -29,13 +19,15 @@ #include <cstdarg> #include <cstddef> #include <cstdint> -#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <cstring> + #if VCPKG_USE_STD_FILESYSTEM #include <filesystem> #else +#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <experimental/filesystem> #endif + #include <fstream> #include <functional> #include <iomanip> @@ -55,11 +47,6 @@ #include <sys/time.h> #endif -#include <sys/types.h> -// glibc defines major and minor in sys/types.h, and should not -#undef major -#undef minor - #include <system_error> #include <thread> #include <time.h> |