Merge branch 'v0.20.x'

src/db/plugins/simple/SimpleDatabasePlugin.cxx

@@ -116,7 +116,7 @@ SimpleDatabase::Check() const
 						 path_utf8 + "\" because the "
 						 "parent path is not a directory");
 
-#ifndef WIN32
+#ifndef _WIN32
 		/* Check if we can write to the directory */
 		if (!CheckAccess(dirPath, X_OK | W_OK)) {
 			const int e = errno;
@@ -135,7 +135,7 @@ SimpleDatabase::Check() const
 	if (!fi.IsRegular())
 		throw std::runtime_error("db file \"" + path_utf8 + "\" is not a regular file");
 
-#ifndef WIN32
+#ifndef _WIN32
 	/* And check that we can write to it */
 	if (!CheckAccess(path, R_OK | W_OK))
 		throw FormatErrno("Can't open db file \"%s\" for reading/writing",

src/db/update/UpdateIO.cxx

@@ -91,7 +91,7 @@ bool
 directory_child_access(Storage &storage, const Directory &directory,
 		       const char *name, int mode) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	/* CheckAccess() is useless on WIN32 */
 	(void)storage;
 	(void)directory;

src/db/update/Walk.cxx

@@ -55,7 +55,7 @@ UpdateWalk::UpdateWalk(EventLoop &_loop, DatabaseListener &_listener,
 	 storage(_storage),
 	 editor(_loop, _listener)
 {
-#ifndef WIN32
+#ifndef _WIN32
 	follow_inside_symlinks =
 		config_get_bool(ConfigOption::FOLLOW_INSIDE_SYMLINKS,
 				DEFAULT_FOLLOW_INSIDE_SYMLINKS);
@@ -133,7 +133,7 @@ UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
 	}
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 static bool
 update_directory_stat(Storage &storage, Directory &directory)
 {
@@ -156,7 +156,7 @@ static int
 FindAncestorLoop(Storage &storage, Directory *parent,
 		 unsigned inode, unsigned device)
 {
-#ifndef WIN32
+#ifndef _WIN32
 	if (device == 0 && inode == 0)
 		/* can't detect loops if the Storage does not support
 		   these numbers */
@@ -258,7 +258,7 @@ bool
 UpdateWalk::SkipSymlink(const Directory *directory,
 			const char *utf8_name) const noexcept
 {
-#ifndef WIN32
+#ifndef _WIN32
 	const auto path_fs = storage.MapChildFS(directory->GetPath(),
 						utf8_name);
 	if (path_fs.IsNull())

src/db/update/Walk.hxx

@@ -36,7 +36,7 @@ class UpdateWalk final {
 	friend class UpdateArchiveVisitor;
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
 	static constexpr bool DEFAULT_FOLLOW_INSIDE_SYMLINKS = true;
 	static constexpr bool DEFAULT_FOLLOW_OUTSIDE_SYMLINKS = true;