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/src/vcpkg.cpp | |
| 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/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 7f9decce1..e1a0a2a0b 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -1,17 +1,6 @@ #include <vcpkg/base/pragmas.h> -#if defined(_WIN32) -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> - -#pragma warning(push) -#pragma warning(disable : 4768) -#include <ShlObj.h> -#pragma warning(pop) -#else -#include <unistd.h> -#endif +#include <vcpkg/base/system_headers.h> #include <vcpkg/base/chrono.h> #include <vcpkg/base/files.h> |