feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Added shortened curl include path to support nuget package rmt_curl

Browse Source
This commit is contained in:
Kiryl Mikhneev
2017-08-31 15:58:38 +03:00
committed by Howard Hinnant
parent 4cb893c780
commit bba9aeafab
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tz.cpp
View File

@@ -142,8 +142,13 @@
#if HAS_REMOTE_API #if HAS_REMOTE_API
// Note curl includes windows.h so we must include curl AFTER definitions of things // Note curl includes windows.h so we must include curl AFTER definitions of things
// that effect windows.h such as NOMINMAX. // that effect windows.h such as NOMINMAX.
#if defined(_MSC_BUILD) && defined(SHORTENED_CURL_INCLUDE)
// For rmt_curl nuget package
# include <curl.h>
#else
# include <curl/curl.h> # include <curl/curl.h>
#endif #endif
#endif
#ifdef _WIN32 #ifdef _WIN32
static CONSTDATA char folder_delimiter = '\\'; static CONSTDATA char folder_delimiter = '\\';
@@ -211,10 +216,10 @@ expand_path(std::string path)
return date::iOSUtils::get_tzdata_path(); return date::iOSUtils::get_tzdata_path();
# else // !TARGET_OS_IPHONE # else // !TARGET_OS_IPHONE
::wordexp_t w{}; ::wordexp_t w{};
std::unique_ptr<::wordexp_t, void(*)(::wordexp_t*)> hold{&w, ::wordfree}; std::unique_ptr<::wordexp_t, void(*)(::wordexp_t*)> hold{&w, ::wordfree};
::wordexp(path.c_str(), &w, 0); ::wordexp(path.c_str(), &w, 0);
if (w.we_wordc != 1) if (w.we_wordc != 1)
throw std::runtime_error("Cannot expand path: " + path); throw std::runtime_error("Cannot expand path: " + path);
path = w.we_wordv[0]; path = w.we_wordv[0];
return path; return path;
# endif // !TARGET_OS_IPHONE # endif // !TARGET_OS_IPHONE
@@ -247,7 +252,7 @@ static
std::string& std::string&
access_install() access_install()
{ {
static std::string install static std::string install
#ifndef INSTALL #ifndef INSTALL
= get_download_folder() + folder_delimiter + "tzdata"; = get_download_folder() + folder_delimiter + "tzdata";
@@ -3161,7 +3166,7 @@ remote_download(const std::string& version)
# else // !_WIN32 # else // !_WIN32
// Create download folder if it does not exist on UNIX system // Create download folder if it does not exist on UNIX system
auto download_folder = get_download_folder(); auto download_folder = get_download_folder();
if (!file_exists(download_folder)) if (!file_exists(download_folder))
{ {
make_directory(download_folder); make_directory(download_folder);
} }