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

Exclude expand_path when INSTALL is not defined

Browse Source
This commit is contained in:
Nicolas Veloz Savino
2017-01-30 14:36:44 -05:00
committed by Howard Hinnant
parent 3a9880999d
commit c1034550d2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tz.cpp
View File

@@ -4,6 +4,7 @@
// Copyright (c) 2015 Ville Voutilainen // Copyright (c) 2015 Ville Voutilainen
// Copyright (c) 2016 Alexander Kormanovsky // Copyright (c) 2016 Alexander Kormanovsky
// Copyright (c) 2016, 2017 Jiangang Zhuang // Copyright (c) 2016, 2017 Jiangang Zhuang
// Copyright (c) 2017 Nicolas Veloz Savino
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal // of this software and associated documentation files (the "Software"), to deal
@@ -189,23 +190,26 @@ get_download_folder()
#else // !_WIN32 #else // !_WIN32
# ifndef INSTALL
static static
std::string std::string
expand_path(std::string path) expand_path(std::string path)
{ {
#if TARGET_OS_IPHONE # if TARGET_OS_IPHONE
return date::iOSUtils::get_tzdata_path(); return date::iOSUtils::get_tzdata_path();
#else # else
::wordexp_t w{}; ::wordexp_t w{};
::wordexp(path.c_str(), &w, 0); ::wordexp(path.c_str(), &w, 0);
assert(w.we_wordc == 1); assert(w.we_wordc == 1);
path = w.we_wordv[0]; path = w.we_wordv[0];
::wordfree(&w); ::wordfree(&w);
return path; return path;
#endif # endif
} }
# endif // !INSTALL
#endif // !_WIN32 #endif // !_WIN32
namespace date namespace date