diff options
author | Thomas Winget <tewinget@gmail.com> | 2015-03-20 16:40:54 -0400 |
---|---|---|
committer | Thomas Winget <tewinget@gmail.com> | 2015-03-20 16:40:54 -0400 |
commit | 2b0583b2c6ffb5e80f7d02ea384f039bfc88363c (patch) | |
tree | eeb39d478eb0f9be5c3cf4dcbebe63d36f348bc9 | |
parent | DNS checkpoint loading for testnet should now be correct (diff) | |
download | monero-2b0583b2c6ffb5e80f7d02ea384f039bfc88363c.tar.xz |
Hopefully fixes build on Windows
-rw-r--r-- | src/common/util.cpp | 2 | ||||
-rw-r--r-- | src/common/util.h | 12 | ||||
-rw-r--r-- | src/daemonizer/windows_daemonizer.inl | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/common/util.cpp b/src/common/util.cpp index 907a87cee..7d39bc4f4 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -326,7 +326,7 @@ std::string get_nix_version_display_string() std::string config_folder; #ifdef WIN32 - config_folder = get_special_folder_path(CSIDL_APPDATA, true) + "/" + CRYPTONOTE_NAME; + config_folder = get_special_folder_path(CSIDL_COMMON_APPDATA, true) + "\\" + CRYPTONOTE_NAME; #else std::string pathRet; char* pszHome = getenv("HOME"); diff --git a/src/common/util.h b/src/common/util.h index 0d23135b0..883fe1e0f 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -58,6 +58,18 @@ namespace tools */ std::string get_default_data_dir(); +#ifdef WIN32 + /** + * @brief + * + * @param nfolder + * @param iscreate + * + * @return + */ + std::string get_special_folder_path(int nfolder, bool iscreate); +#endif + /*! \brief Returns the OS version string * * \details This is a wrapper around the primitives diff --git a/src/daemonizer/windows_daemonizer.inl b/src/daemonizer/windows_daemonizer.inl index 65c1e4195..5091ca948 100644 --- a/src/daemonizer/windows_daemonizer.inl +++ b/src/daemonizer/windows_daemonizer.inl @@ -81,9 +81,9 @@ namespace daemonizer boost::program_options::variables_map const & vm ) { - if (command_line::arg_present(vm, arg_is_service)) + if (command_line::has_arg(vm, arg_is_service)) { - if (command_line::arg_present(vm, command_line::arg_data_dir)) + if (command_line::has_arg(vm, command_line::arg_data_dir)) { return command_line::get_arg(vm, command_line::arg_data_dir); } |