Merge pull request #2827

fdf0acbf Tools, daemonizer: fix building on Windows (iDunk5400)

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

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
       {