fix windows compile

XUranus · Dec 30, 2023 · 3321ea3 · 3321ea3
1 parent 336c11d
commit 3321ea3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cli/vbackup.cpp b/cli/vbackup.cpp
@@ -110,7 +110,7 @@ static CliArgs ParseCliArgs(int argc, const char** argv)
     GetOptionResult result = GetOption(
         argv + 1, argc - 1,
         "v:n:f:d:m:k:p:h:r:l:",
-        {"--volume=", "--name=", "--format=", "--data=", "--meta=", "--checkpoint="
+        {"--volume=", "--name=", "--format=", "--data=", "--meta=", "--checkpoint=",
         "--prevmeta=", "--help", "--restore", "--loglevel="});
     for (const OptionResult opt: result.opts) {
         if (opt.option == "v" || opt.option == "volume") {
@@ -196,7 +196,6 @@ void InitLogger(const CliArgs& cliArgs)
 #else
     conf.logDirPath = "/tmp/LoggerTest";
 #endif
-    Logger::GetInstance()->SetLogLevel(LoggerLevel::DEBUG);
     if (!Logger::GetInstance()->Init(conf)) {
         std::cerr << "Init logger failed" << std::endl;
     }

diff --git a/src/native/linux/LinuxMountUtils.cpp b/src/native/linux/LinuxMountUtils.cpp
@@ -4,6 +4,8 @@
  * https://android.googlesource.com/platform/system/core/+/jb-mr1.1-dev-plus-aosp/toolbox/mount.c
  */
 
+#ifdef __linux__
+
 #include <cerrno>
 #include <fcntl.h>
 #include <sys/mount.h>
@@ -322,6 +324,7 @@ bool linuxmountutil::Umount(const std::string& mountTargetPath, bool force)
         ::umount2(mountTargetPath.c_str(), flags) != 0) {
         return false;
     }
+    return true;
 }
 
 bool linuxmountutil::IsMountPoint(const std::string& dirPath)
@@ -362,4 +365,6 @@ std::string linuxmountutil::GetMountDevicePath(const std::string& mountTargetPat
     }
     ::endmntent(mountsFile);
     return devicePath;
-}
+}
+
+#endif