From 9d9a50bc9823ca1673019aa18f23d28c7a1d2ff9 Mon Sep 17 00:00:00 2001
From: nicole mazzuca <mazzucan@outlook.com>
Date: Wed, 20 May 2020 10:10:26 -0700
Subject: [vcpkg] fix extern C around ctermid (#11343)

Additionally, move the system_header invocations to their own header file,
<vcpkg/base/system_header.h>
---
 toolsrc/src/vcpkg-test/system.cpp    | 10 +---------
 toolsrc/src/vcpkg-test/util.cpp      | 12 ++++++------
 toolsrc/src/vcpkg.cpp                | 13 +------------
 toolsrc/src/vcpkg/base/files.cpp     |  5 ++---
 toolsrc/src/vcpkgmetricsuploader.cpp |  3 ++-
 5 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg-test/system.cpp b/toolsrc/src/vcpkg-test/system.cpp
index 6b9dfaf95..6e87f9b3e 100644
--- a/toolsrc/src/vcpkg-test/system.cpp
+++ b/toolsrc/src/vcpkg-test/system.cpp
@@ -1,4 +1,4 @@
-#define _POSIX_C_SOURCE 200112L
+#include <vcpkg/base/system_headers.h>
 #include <catch2/catch.hpp>
 
 #include <string>
@@ -8,14 +8,6 @@
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.h>
 
-#if defined(_WIN32)
-#define _NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-#include <stdlib.h>
-#endif
-
 using vcpkg::Optional;
 using vcpkg::StringView;
 using vcpkg::ZStringView;
diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp
index 8ead355f1..ce38e62e4 100644
--- a/toolsrc/src/vcpkg-test/util.cpp
+++ b/toolsrc/src/vcpkg-test/util.cpp
@@ -1,3 +1,5 @@
+#include <vcpkg/base/system_headers.h>
+
 #include <catch2/catch.hpp>
 #include <vcpkg-test/util.h>
 
@@ -20,15 +22,13 @@
 #define FILESYSTEM_SYMLINK_UNIX 1
 #define FILESYSTEM_SYMLINK_NONE 2
 
-#if defined(__cpp_lib_filesystem)
+#if VCPKG_USE_STD_FILESYSTEM
 
 #define FILESYSTEM_SYMLINK FILESYSTEM_SYMLINK_STD
-#include <filesystem> // required for filesystem::create_{directory_}symlink
 
 #elif !defined(_MSC_VER)
 
 #define FILESYSTEM_SYMLINK FILESYSTEM_SYMLINK_UNIX
-#include <unistd.h>
 
 #else
 
@@ -169,10 +169,10 @@ namespace vcpkg::Test
 #if FILESYSTEM_SYMLINK == FILESYSTEM_SYMLINK_STD
         if (can_create_symlinks())
         {
-            std::filesystem::path targetp = target.native();
-            std::filesystem::path filep = file.native();
+            fs::path targetp = target.native();
+            fs::path filep = file.native();
 
-            std::filesystem::create_symlink(targetp, filep, ec);
+            fs::stdfs::create_symlink(targetp, filep, ec);
         }
         else
         {
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>
diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index 7f4d18616..0ef2fa992 100644
--- a/toolsrc/src/vcpkg/base/files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -11,9 +11,8 @@
 #if !defined(_WIN32)
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#endif // ^^^ !defined(_WIN32)
+#endif
+
 #if defined(__linux__)
 #include <sys/sendfile.h>
 #elif defined(__APPLE__)
diff --git a/toolsrc/src/vcpkgmetricsuploader.cpp b/toolsrc/src/vcpkgmetricsuploader.cpp
index 2239fe750..95195b3be 100644
--- a/toolsrc/src/vcpkgmetricsuploader.cpp
+++ b/toolsrc/src/vcpkgmetricsuploader.cpp
@@ -3,7 +3,8 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
 
-#include <Windows.h>
+#include <vcpkg/base/system_headers.h>
+#include <shellapi.h>
 
 using namespace vcpkg;
 
-- 
cgit v1.2.3