diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-14 14:31:16 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-12-14 14:31:28 -0800 |
| commit | 63a23cf0cad4da12eed69883f37c21d319461187 (patch) | |
| tree | 39ae91f7d6aa38d8265e1cc1bf356af0b48126a7 /toolsrc/src | |
| parent | 7b7e7dac3b5518a263053fcc2fd25bca5f71d031 (diff) | |
| download | vcpkg-63a23cf0cad4da12eed69883f37c21d319461187.tar.gz vcpkg-63a23cf0cad4da12eed69883f37c21d319461187.zip | |
[vcpkg] Fix regressions in WSL build.
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/base/chrono.cpp | 22 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/commands.upgrade.cpp (renamed from toolsrc/src/commands.upgrade.cpp) | 0 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/userconfig.cpp | 7 |
3 files changed, 20 insertions, 9 deletions
diff --git a/toolsrc/src/vcpkg/base/chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp index 03c1ecce9..00f8ba3f1 100644 --- a/toolsrc/src/vcpkg/base/chrono.cpp +++ b/toolsrc/src/vcpkg/base/chrono.cpp @@ -92,14 +92,20 @@ namespace vcpkg::Chrono Optional<CTime> CTime::parse(CStringView str) { CTime ret; - auto assigned = sscanf_s(str.c_str(), - "%d-%d-%dT%d:%d:%d.", - &ret.m_tm.tm_year, - &ret.m_tm.tm_mon, - &ret.m_tm.tm_mday, - &ret.m_tm.tm_hour, - &ret.m_tm.tm_min, - &ret.m_tm.tm_sec); + auto assigned = +#if defined(_WIN32) + sscanf_s +#else + sscanf +#endif + (str.c_str(), + "%d-%d-%dT%d:%d:%d.", + &ret.m_tm.tm_year, + &ret.m_tm.tm_mon, + &ret.m_tm.tm_mday, + &ret.m_tm.tm_hour, + &ret.m_tm.tm_min, + &ret.m_tm.tm_sec); if (assigned != 6) return nullopt; if (ret.m_tm.tm_year < 1900) return nullopt; ret.m_tm.tm_year -= 1900; diff --git a/toolsrc/src/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index d2c868870..d2c868870 100644 --- a/toolsrc/src/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp diff --git a/toolsrc/src/vcpkg/userconfig.cpp b/toolsrc/src/vcpkg/userconfig.cpp index d13a46f41..906594691 100644 --- a/toolsrc/src/vcpkg/userconfig.cpp +++ b/toolsrc/src/vcpkg/userconfig.cpp @@ -5,6 +5,7 @@ #include <vcpkg/paragraphs.h> #include <vcpkg/userconfig.h> +#if defined(_WIN32) namespace { static vcpkg::Lazy<fs::path> s_localappdata; @@ -24,13 +25,14 @@ namespace }); } } +#endif namespace vcpkg { UserConfig UserConfig::try_read_data(const Files::Filesystem& fs) { UserConfig ret; - +#if defined(_WIN32) try { auto maybe_pghs = Paragraphs::get_paragraphs(fs, get_localappdata() / "vcpkg" / "config"); @@ -56,12 +58,14 @@ namespace vcpkg catch (...) { } +#endif return ret; } void UserConfig::try_write_data(Files::Filesystem& fs) const { +#if defined(_WIN32) try { std::error_code ec; @@ -79,5 +83,6 @@ namespace vcpkg catch (...) { } +#endif } } |