diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:54:14 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:54:14 +0200 |
| commit | 8a8c918dc3b286452a303286791faa6391e9c4bd (patch) | |
| tree | 8baeab8bec01882e56ce9ca4b69f51d4cbacfaaa | |
| parent | Merge pull request #2825 (diff) | |
| parent | Tools, daemonizer: fix building on Windows (diff) | |
| download | monero-8a8c918dc3b286452a303286791faa6391e9c4bd.tar.xz | |
Merge pull request #2827
fdf0acbf Tools, daemonizer: fix building on Windows (iDunk5400)
| -rw-r--r-- | src/common/util.h | 5 | ||||
| -rw-r--r-- | src/daemonizer/windows_daemonizer.inl | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/common/util.h b/src/common/util.h index 1aac026c1..53ff78af8 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -39,6 +39,11 @@ #include <memory> #include <string> +#ifdef _WIN32 +#include "windows.h" +#include "misc_log_ex.h" +#endif + #include "crypto/hash.h" /*! \brief Various Tools diff --git a/src/daemonizer/windows_daemonizer.inl b/src/daemonizer/windows_daemonizer.inl index 012cd1e67..e02468125 100644 --- a/src/daemonizer/windows_daemonizer.inl +++ b/src/daemonizer/windows_daemonizer.inl @@ -111,9 +111,9 @@ namespace daemonizer { if (command_line::has_arg(vm, arg_is_service)) { - if (command_line::has_arg(vm, command_line::arg_data_dir)) + if (command_line::has_arg(vm, cryptonote::arg_data_dir)) { - return command_line::get_arg(vm, command_line::arg_data_dir); + return command_line::get_arg(vm, cryptonote::arg_data_dir); } else { |