Merge pull request #2827

fdf0acbf Tools, daemonizer: fix building on Windows (iDunk5400)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:54:14 +02:00
commit 8a8c918dc3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 7 additions and 2 deletions

View File

@ -39,6 +39,11 @@
#include <memory> #include <memory>
#include <string> #include <string>
#ifdef _WIN32
#include "windows.h"
#include "misc_log_ex.h"
#endif
#include "crypto/hash.h" #include "crypto/hash.h"
/*! \brief Various Tools /*! \brief Various Tools

View File

@ -111,9 +111,9 @@ namespace daemonizer
{ {
if (command_line::has_arg(vm, arg_is_service)) 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 else
{ {