release v0.20.13

Signed-off-by: FlashSystems <developer@flashsystems.de>

Makefile.am

@@ -702,6 +702,7 @@ libstorage_a_SOURCES = \
 	src/storage/MemoryDirectoryReader.cxx src/storage/MemoryDirectoryReader.hxx \
 	src/storage/Configured.cxx src/storage/Configured.hxx \
 	src/storage/plugins/LocalStorage.cxx src/storage/plugins/LocalStorage.hxx \
+	src/storage/StorageState.cxx src/storage/StorageState.hxx \
 	src/storage/FileInfo.hxx
 
 libstorage_a_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -754,6 +755,7 @@ libneighbor_a_SOURCES = \
 	src/neighbor/NeighborPlugin.hxx
 
 libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(UPNP_CFLAGS) \
 	$(SMBCLIENT_CFLAGS)
 
 if ENABLE_SMBCLIENT
@@ -803,6 +805,8 @@ libdb_plugins_a_SOURCES = \
 	src/db/plugins/simple/PrefixedLightSong.hxx \
 	src/db/plugins/simple/SimpleDatabasePlugin.cxx \
 	src/db/plugins/simple/SimpleDatabasePlugin.hxx
+libdb_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(UPNP_CFLAGS)
 
 if ENABLE_LIBMPDCLIENT
 libdb_plugins_a_SOURCES += \
@@ -2412,6 +2416,7 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
 	$(wildcard $(srcdir)/doc/include/*.xml) \
 	systemd/system/mpd.socket \
+	$(wildcard $(srcdir)/python/build/*.py) \
 	android/AndroidManifest.xml \
 	android/build.py \
 	android/custom_rules.xml \
@@ -2419,5 +2424,6 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	android/src/Bridge.java \
 	android/src/Loader.java \
 	android/src/Main.java \
+	win32/build.py \
 	win32/res/mpd.rc.in win32/res/mpd.ico \
 	src/haiku/App_MusicPD

NEWS

@@ -1,3 +1,18 @@
+ver 0.20.13 (2017/12/18)
+* output
+  - osx: set up ring buffer to hold at least 100ms
+* mixer
+  - alsa: fix rounding errors
+* database
+  - simple: don't purge mount points on update/rescan
+  - simple: fix "mount" bug caused by bad compiler optimization
+  - simple: fix "lsinfo" into mount points
+  - upnp: work around libupnp 1.6.24 API breakage
+* queue: fix spuriously misplaced prioritized songs
+* save and restore mountpoints within the state file
+* include Windows cross-build script in source tarball
+* fix Windows build failures
+
 ver 0.20.12 (2017/11/25)
 * database
   - upnp: adapt to libupnp 1.8 API changes

android/build.py

@@ -46,13 +46,14 @@ class AndroidNdkToolchain:
 
         self.ndk_arch = 'arm'
         android_abi = 'armeabi-v7a'
-        ndk_platform = 'android-14'
+        ndk_platform = 'android-21'
 
         # select the NDK compiler
         gcc_version = '4.9'
 
         ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
-        sysroot = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch)
+        sysroot = os.path.join(ndk_path, 'sysroot')
+        target_root = os.path.join(ndk_platform_path, 'arch-' + self.ndk_arch)
 
         install_prefix = os.path.join(arch_path, 'root')
 
@@ -79,8 +80,15 @@ class AndroidNdkToolchain:
 
         self.cflags = '-Os -g ' + common_flags
         self.cxxflags = '-Os -g ' + common_flags
-        self.cppflags = '--sysroot=' + self.sysroot + ' -isystem ' + os.path.join(install_prefix, 'include')
+        self.cppflags = '--sysroot=' + sysroot + \
-        self.ldflags = '--sysroot=' + self.sysroot + ' ' + common_flags + ' -L' + os.path.join(install_prefix, 'lib')
+            ' -isystem ' + os.path.join(install_prefix, 'include') + \
+            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
+            ' -D__ANDROID_API__=21'
+        self.ldflags = '--sysroot=' + sysroot + \
+            ' -L' + os.path.join(install_prefix, 'lib') + \
+            ' -L' + os.path.join(target_root, 'usr', 'lib') + \
+            ' -B' + os.path.join(target_root, 'usr', 'lib') + \
+            ' ' + common_flags
         self.libs = ''
 
         self.is_arm = self.ndk_arch == 'arm'

configure.ac

@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.20.12, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.20.13, musicpd-dev-team@lists.sourceforge.net)
 
 VERSION_MAJOR=0
 VERSION_MINOR=20
-VERSION_REVISION=12
+VERSION_REVISION=13
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -492,7 +492,7 @@ if test x$enable_ipv6 = xyes; then
 	AC_EGREP_CPP([AP_maGiC_VALUE],
 	[
 #include <sys/types.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

python/build/libs.py

@@ -69,8 +69,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.xz',
+    'http://ffmpeg.org/releases/ffmpeg-3.4.1.tar.xz',
-    'd2a9002cdc6b533b59728827186c044ad02ba64841f1b7cd6c21779875453a1e',
+    '5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -84,17 +84,26 @@ ffmpeg = FfmpegProject(
         '--disable-swscale',
         '--disable-postproc',
         '--disable-avfilter',
+        '--disable-lzo',
+        '--disable-faan',
+        '--disable-pixelutils',
         '--disable-network',
         '--disable-encoders',
         '--disable-protocols',
-        '--disable-outdevs',
+        '--disable-devices',
         '--disable-filters',
+        '--disable-v4l2_m2m',
+
+        # clang misinterprets the "B0" in hevc_mvs.c as binary
+        # literal, which breaks the build; but we don't need that
+        # video codec anyway
+        '--disable-decoder=hevc',
     ],
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.55.1.tar.xz',
+    'http://curl.haxx.se/download/curl-7.57.0.tar.xz',
-    '3eafca6e84ecb4af5f35795dee84e643d5428287e88c041122bb8dac18676bb7',
+    'f5f6fd3c72b7b8389969f4fb671ed8532fa9b5bb7a5cae7ca89bc1cea45c7878',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -114,7 +123,7 @@ curl = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2',
+    'http://downloads.sourceforge.net/project/boost/boost/1.65.1/boost_1_65_1.tar.bz2',
-    'ea26712742e2fb079c2a566a31f3266973b76e38222b9f88b387e3c8b2f9902c',
+    '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81',
     'include/boost/version.hpp',
 )

src/CommandLine.cxx

@@ -67,7 +67,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define CONFIG_FILE_LOCATION PATH_LITERAL("mpd\\mpd.conf")
 #define APP_CONFIG_FILE_LOCATION PATH_LITERAL("conf\\mpd.conf")
 #else
@@ -389,7 +389,7 @@ ParseCommandLine(int argc, char **argv, struct options *options)
 	ConfigLoader loader;
 
 	bool found =
-#ifdef WIN32
+#ifdef _WIN32
 		loader.TryFile(GetUserConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetSystemConfigDir(), CONFIG_FILE_LOCATION) ||
 		loader.TryFile(GetAppBaseDir(), APP_CONFIG_FILE_LOCATION);

src/LocateUri.hxx

@@ -24,7 +24,7 @@
 #include "Compiler.h"
 #include "fs/AllocatedPath.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ABSOLUTE

src/LogBackend.cxx

@@ -162,7 +162,7 @@ FileLog(const Domain &domain, const char *message)
 		domain.GetName(),
 		chomp_length(message), message);
 
-#ifdef WIN32
+#ifdef _WIN32
 	/* force-flush the log file, because setvbuf() does not seem
 	   to have an effect on WIN32 */
 	fflush(stderr);

src/LogInit.cxx

@@ -72,7 +72,7 @@ log_init_file(int line)
 
 	out_fd = open_log_file();
 	if (out_fd < 0) {
-#ifdef WIN32
+#ifdef _WIN32
 		const std::string out_path_utf8 = out_path.ToUTF8();
 		throw FormatRuntimeError("failed to open log file \"%s\" (config line %d)",
 					 out_path_utf8.c_str(), line);
@@ -182,7 +182,7 @@ void setup_log_output()
 	fflush(nullptr);
 
 	if (out_fd < 0) {
-#ifdef WIN32
+#ifdef _WIN32
 		return;
 #else
 		out_fd = open("/dev/null", O_WRONLY);

src/LogLevel.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LOG_LEVEL_HXX
 #define MPD_LOG_LEVEL_HXX
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ERROR

src/Main.cxx

@@ -106,7 +106,7 @@
 #include <locale.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
@@ -289,7 +289,7 @@ glue_state_file_init()
  */
 static void winsock_init(void)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	WSADATA sockinfo;
 
 	int retval = WSAStartup(MAKEWORD(2, 2), &sockinfo);
@@ -418,7 +418,7 @@ Instance::OnIdle(unsigned flags)
 
 int main(int argc, char *argv[])
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return win32_main(argc, argv);
 #else
 	return mpd_main(argc, argv);
@@ -615,7 +615,7 @@ try {
 	   playlist_state_restore() */
 	instance->partition->pc.LockUpdateAudio();
 
-#ifdef WIN32
+#ifdef _WIN32
 	win32_app_started();
 #endif
 
@@ -630,7 +630,7 @@ try {
 	/* run the main loop */
 	instance->event_loop.Run();
 
-#ifdef WIN32
+#ifdef _WIN32
 	win32_app_stopping();
 #endif
 
@@ -702,7 +702,7 @@ try {
 	daemonize_finish();
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 	WSACleanup();
 #endif
 

src/Main.hxx

@@ -42,7 +42,7 @@ int mpd_main(int argc, char *argv[]);
 
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 
 /**
  * If program is run as windows service performs nessesary initialization

src/MusicChunk.hxx

@@ -79,12 +79,20 @@ struct MusicChunk {
 	 */
 	ReplayGainInfo replay_gain_info;
 
+	/**
+	 * A magic value for #replay_gain_serial which omits updating
+	 * the #ReplayGainFilter.  This is used by "silence" chunks
+	 * (see PlayerThread::SendSilence()) so they don't affect the
+	 * replay gain.
+	 */
+	static constexpr unsigned IGNORE_REPLAY_GAIN = ~0u;
+
 	/**
 	 * A serial number for checking if replay gain info has
 	 * changed since the last chunk.  The magic value 0 indicates
 	 * that there is no replay gain info available.
 	 */
-	unsigned replay_gain_serial = 0;
+	unsigned replay_gain_serial;
 
 	/** the data (probably PCM) */
 	uint8_t data[CHUNK_SIZE];

src/StateFile.cxx

@@ -24,6 +24,7 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
+#include "storage/StorageState.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
 #include "mixer/Volume.hxx"
@@ -56,6 +57,9 @@ StateFile::RememberVersions() noexcept
 	prev_output_version = audio_output_state_get_version();
 	prev_playlist_version = playlist_state_get_hash(partition.playlist,
 							partition.pc);
+#ifdef ENABLE_DATABASE
+	prev_storage_version = storage_state_get_hash(partition.instance);
+#endif
 }
 
 bool
@@ -64,7 +68,11 @@ StateFile::IsModified() const noexcept
 	return prev_volume_version != sw_volume_state_get_hash() ||
 		prev_output_version != audio_output_state_get_version() ||
 		prev_playlist_version != playlist_state_get_hash(partition.playlist,
-								 partition.pc);
+								 partition.pc)
+#ifdef ENABLE_DATABASE
+		|| prev_storage_version != storage_state_get_hash(partition.instance)
+#endif
+		;
 }
 
 inline void
@@ -72,6 +80,11 @@ StateFile::Write(BufferedOutputStream &os)
 {
 	save_sw_volume_state(os);
 	audio_output_state_save(os, partition.outputs);
+
+#ifdef ENABLE_DATABASE
+	storage_state_save(os, partition.instance);
+#endif
+
 	playlist_state_save(os, partition.playlist, partition.pc);
 }
 
@@ -123,6 +136,10 @@ try {
 			playlist_state_restore(line, file, song_loader,
 					       partition.playlist,
 					       partition.pc);
+#ifdef ENABLE_DATABASE
+		success = success || storage_state_restore(line, file, partition.instance);
+#endif
+
 		if (!success)
 			FormatError(state_file_domain,
 				    "Unrecognized line in state file: %s",

src/StateFile.hxx

@@ -46,6 +46,10 @@ class StateFile final : private TimeoutMonitor {
 	unsigned prev_volume_version = 0, prev_output_version = 0,
 		prev_playlist_version = 0;
 
+#ifdef ENABLE_DATABASE
+	unsigned prev_storage_version = 0;
+#endif
+
 public:
 	static constexpr std::chrono::steady_clock::duration DEFAULT_INTERVAL = std::chrono::minutes(2);
 

src/Stats.cxx

@@ -31,7 +31,7 @@
 
 #include <chrono>
 
-#ifndef WIN32
+#ifndef _WIN32
 /**
  * The monotonic time stamp when MPD was started.  It is used to
  * calculate the uptime.
@@ -114,7 +114,7 @@ stats_print(Response &r, const Partition &partition)
 {
 	r.Format("uptime: %u\n"
 		 "playtime: %lu\n",
-#ifdef WIN32
+#ifdef _WIN32
 		 GetProcessUptimeS(),
 #else
 		 (unsigned)std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count(),

src/TimePrint.cxx

@@ -24,7 +24,7 @@
 void
 time_print(Response &r, const char *name, time_t t)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	const struct tm *tm2 = gmtime(&t);
 #else
 	struct tm tm;
@@ -35,7 +35,7 @@ time_print(Response &r, const char *name, time_t t)
 
 	char buffer[32];
 	strftime(buffer, sizeof(buffer),
-#ifdef WIN32
+#ifdef _WIN32
 		 "%Y-%m-%dT%H:%M:%SZ",
 #else
 		 "%FT%TZ",

src/client/ClientFile.cxx

@@ -28,7 +28,7 @@
 void
 Client::AllowFile(Path path_fs) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)path_fs;
 
 	throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");

src/client/ClientMessage.hxx

@@ -24,7 +24,7 @@
 
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 /* fuck WIN32! */
 #include <windows.h>
 #undef GetMessage

src/client/ClientNew.cxx

@@ -29,7 +29,7 @@
 #include "Log.hxx"
 
 #include <assert.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

src/command/CommandResult.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_COMMAND_RESULT_HXX
 #define MPD_COMMAND_RESULT_HXX
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ERROR

src/command/FileCommands.cxx

@@ -58,7 +58,7 @@ skip_path(Path name_fs) noexcept
 	return name_fs.HasNewline();
 }
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 /* PRIu64 causes bogus compiler warning */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
@@ -101,7 +101,7 @@ handle_listfiles_local(Response &r, Path path_fs)
 	return CommandResult::OK;
 }
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 #pragma GCC diagnostic pop
 #endif
 

src/command/StorageCommands.cxx

@@ -50,7 +50,7 @@ skip_path(const char *name_utf8) noexcept
 	return strchr(name_utf8, '\n') != nullptr;
 }
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 /* PRIu64 causes bogus compiler warning */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat"
@@ -94,7 +94,7 @@ handle_listfiles_storage(Response &r, StorageDirectoryReader &reader)
 	}
 }
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 #pragma GCC diagnostic pop
 #endif
 

src/config/ConfigOption.hxx

@@ -22,7 +22,7 @@
 
 #include "Compiler.h"
 
-#if defined(WIN32) && CLANG_OR_GCC_VERSION(4,7)
+#if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7)
 /* "INPUT" is declared by winuser.h */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
@@ -93,7 +93,7 @@ enum class ConfigBlockOption {
 	MAX
 };
 
-#if defined(WIN32) && CLANG_OR_GCC_VERSION(4,7)
+#if defined(_WIN32) && CLANG_OR_GCC_VERSION(4,7)
 #pragma GCC diagnostic pop
 #endif
 

src/config/ConfigPath.cxx

@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <string.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <pwd.h>
 
 /**
@@ -79,7 +79,7 @@ ParsePath(const char *path)
 {
 	assert(path != nullptr);
 
-#ifndef WIN32
+#ifndef _WIN32
 	if (path[0] == '~') {
 		++path;
 
@@ -119,7 +119,7 @@ ParsePath(const char *path)
 	} else {
 #endif
 		return AllocatedPath::FromUTF8Throw(path);
-#ifndef WIN32
+#ifndef _WIN32
 	}
 #endif
 }

src/db/plugins/simple/Directory.cxx

@@ -109,7 +109,7 @@ Directory::PruneEmpty() noexcept
 	     child != end;) {
 		child->PruneEmpty();
 
-		if (child->IsEmpty())
+		if (child->IsEmpty() && !child->IsMount())
 			child = children.erase_and_dispose(child,
 							   DeleteDisposer());
 		else
@@ -230,7 +230,7 @@ Directory::Walk(bool recursive, const SongFilter *filter,
 		   call will lock it again */
 		const ScopeDatabaseUnlock unlock;
 		WalkMount(GetPath(), *mounted_database,
-			  recursive, filter,
+			  "", recursive, filter,
 			  visit_directory, visit_song,
 			  visit_playlist);
 		return;

src/db/plugins/simple/Directory.hxx

@@ -127,7 +127,6 @@ public:
 	 *
 	 * @param name_utf8 the UTF-8 encoded name of the new sub directory
 	 */
-	gcc_malloc
 	Directory *CreateChild(const char *name_utf8);
 
 	/**

src/db/plugins/simple/Mount.cxx

@@ -72,7 +72,7 @@ PrefixVisitPlaylist(const char *base, const VisitPlaylist &visit_playlist,
 
 void
 WalkMount(const char *base, const Database &db,
-	  bool recursive, const SongFilter *filter,
+	  const char* uri, bool recursive, const SongFilter *filter,
 	  const VisitDirectory &visit_directory, const VisitSong &visit_song,
 	  const VisitPlaylist &visit_playlist)
 {
@@ -93,5 +93,5 @@ WalkMount(const char *base, const Database &db,
 		vp = std::bind(PrefixVisitPlaylist,
 			       base, std::ref(visit_playlist), _1, _2);
 
-	db.Visit(DatabaseSelection("", recursive, filter), vd, vs, vp);
+	db.Visit(DatabaseSelection(uri, recursive, filter), vd, vs, vp);
 }

src/db/plugins/simple/Mount.hxx

@@ -27,7 +27,7 @@ class SongFilter;
 
 void
 WalkMount(const char *base, const Database &db,
-	  bool recursive, const SongFilter *filter,
+	  const char* uri, bool recursive, const SongFilter *filter,
 	  const VisitDirectory &visit_directory, const VisitSong &visit_song,
 	  const VisitPlaylist &visit_playlist);
 

src/db/plugins/simple/SimpleDatabasePlugin.cxx

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "SimpleDatabasePlugin.hxx"
 #include "PrefixedLightSong.hxx"
+#include "Mount.hxx"
 #include "db/DatabasePlugin.hxx"
 #include "db/Selection.hxx"
 #include "db/Helpers.hxx"
@@ -115,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;
@@ -134,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",
@@ -270,6 +271,18 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
 	ScopeDatabaseLock protect;
 
 	auto r = root->LookupDirectory(selection.uri.c_str());
+
+	if (r.directory->IsMount()) {
+		/* pass the request and the remaining uri to the mounted database */
+		protect.unlock();
+
+		WalkMount(r.directory->GetPath(), *(r.directory->mounted_database),
+			(r.uri == nullptr)?"":r.uri, selection.recursive, selection.filter,
+			visit_directory, visit_song, visit_playlist);
+
+		return;
+	}
+
 	if (r.uri == nullptr) {
 		/* it's a directory */
 

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);
@@ -104,7 +104,7 @@ inline void
 UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
 {
 	directory.ForEachChildSafe([&](Directory &child){
-			if (DirectoryExists(storage, child))
+			if (child.IsMount() || DirectoryExists(storage, child))
 				return;
 
 			editor.LockDeleteDirectory(&child);
@@ -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;
 

src/decoder/plugins/FlacIOHandle.cxx

@@ -46,7 +46,7 @@ FlacIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 
 			p += nbytes;
 
-#ifndef WIN32
+#ifndef _WIN32
 		} catch (const std::system_error &e) {
 			errno = e.code().category() == ErrnoCategory()
 				? e.code().value()

src/event/MultiSocketMonitor.cxx

@@ -23,7 +23,7 @@
 
 #include <algorithm>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <poll.h>
 #endif
 
@@ -50,7 +50,7 @@ MultiSocketMonitor::ClearSocketList()
 	fds.clear();
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 
 void
 MultiSocketMonitor::ReplaceSocketList(pollfd *pfds, unsigned n)

src/event/MultiSocketMonitor.hxx

@@ -31,7 +31,7 @@
 
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 /* ERROR is a WIN32 macro that poisons our namespace; this is a kludge
    to allow us to use it anyway */
 #ifdef ERROR
@@ -39,7 +39,7 @@
 #endif
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
 struct pollfd;
 #endif
 
@@ -189,7 +189,7 @@ public:
 		}
 	}
 
-#ifndef WIN32
+#ifndef _WIN32
 	/**
 	 * Replace the socket list with the given file descriptors.
 	 * The given pollfd array will be modified by this method.

src/event/ServerSocket.cxx

@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <winsock.h>
 #else

src/event/SignalMonitor.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SignalMonitor.hxx"
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "SocketMonitor.hxx"
 #include "util/Manual.hxx"

src/event/SignalMonitor.hxx

@@ -24,7 +24,7 @@
 
 class EventLoop;
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "util/BindMethod.hxx"
 

src/event/SocketMonitor.cxx

@@ -24,7 +24,7 @@
 
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

src/event/SocketMonitor.hxx

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stddef.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 /* ERROR is a WIN32 macro that poisons our namespace; this is a kludge
    to allow us to use it anyway */
 #ifdef ERROR

src/fs/AllocatedPath.cxx

@@ -31,7 +31,7 @@ AllocatedPath::~AllocatedPath() {}
 AllocatedPath
 AllocatedPath::FromUTF8(const char *path_utf8) noexcept
 {
-#if defined(HAVE_FS_CHARSET) || defined(WIN32)
+#if defined(HAVE_FS_CHARSET) || defined(_WIN32)
 	try {
 		return AllocatedPath(::PathFromUTF8(path_utf8));
 	} catch (const std::runtime_error &) {
@@ -45,7 +45,7 @@ AllocatedPath::FromUTF8(const char *path_utf8) noexcept
 AllocatedPath
 AllocatedPath::FromUTF8Throw(const char *path_utf8)
 {
-#if defined(HAVE_FS_CHARSET) || defined(WIN32)
+#if defined(HAVE_FS_CHARSET) || defined(_WIN32)
 	return AllocatedPath(::PathFromUTF8(path_utf8));
 #else
 	return FromFS(path_utf8);

src/fs/Charset.cxx

@@ -24,7 +24,7 @@
 #include "lib/icu/Converter.hxx"
 #include "util/AllocatedString.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "lib/icu/Win32.hxx"
 #include <windows.h>
 #endif
@@ -70,7 +70,7 @@ GetFSCharset() noexcept
 {
 #ifdef HAVE_FS_CHARSET
 	return fs_charset.empty() ? "UTF-8" : fs_charset.c_str();
-#elif defined(WIN32)
+#elif defined(_WIN32)
 	return "ACP";
 #else
 	return "UTF-8";
@@ -100,7 +100,7 @@ PathToUTF8(PathTraitsFS::const_pointer_type path_fs)
 	assert(path_fs != nullptr);
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 	const auto buffer = WideCharToMultiByte(CP_UTF8, path_fs);
 	return FixSeparators(PathTraitsUTF8::string(buffer.c_str()));
 #else
@@ -116,7 +116,7 @@ PathToUTF8(PathTraitsFS::const_pointer_type path_fs)
 #endif
 }
 
-#if defined(HAVE_FS_CHARSET) || defined(WIN32)
+#if defined(HAVE_FS_CHARSET) || defined(_WIN32)
 
 PathTraitsFS::string
 PathFromUTF8(PathTraitsUTF8::const_pointer_type path_utf8)
@@ -126,7 +126,7 @@ PathFromUTF8(PathTraitsUTF8::const_pointer_type path_utf8)
 	assert(path_utf8 != nullptr);
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 	const auto buffer = MultiByteToWideChar(CP_UTF8, path_utf8);
 	return PathTraitsFS::string(buffer.c_str());
 #else

src/fs/Charset.hxx

@@ -24,7 +24,7 @@
 #include "Compiler.h"
 #include "Traits.hxx"
 
-#if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(WIN32)
+#if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(_WIN32)
 #define HAVE_FS_CHARSET
 #endif
 

src/fs/CheckFile.cxx

@@ -41,7 +41,7 @@ try {
 		return;
 	}
 
-#ifndef WIN32
+#ifndef _WIN32
 	try {
 		const auto x = AllocatedPath::Build(path_fs,
 						    PathTraitsFS::CURRENT_DIRECTORY);

src/fs/DirectoryReader.cxx

@@ -21,7 +21,7 @@
 #include "DirectoryReader.hxx"
 #include "system/Error.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 DirectoryReader::DirectoryReader(Path dir)
 	:handle(FindFirstFile(MakeWildcardPath(dir.c_str()), &data))

src/fs/DirectoryReader.hxx

@@ -23,7 +23,7 @@
 #include "check.h"
 #include "Path.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include <windows.h>
 #include <tchar.h>

src/fs/FileInfo.hxx

@@ -26,13 +26,13 @@
 
 #include <stdint.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <fileapi.h>
 #else
 #include <sys/stat.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 
 static inline constexpr uint64_t
 ConstructUint64(DWORD lo, DWORD hi)
@@ -54,7 +54,7 @@ class FileInfo {
 				bool follow_symlinks);
 	friend class FileReader;
 
-#ifdef WIN32
+#ifdef _WIN32
 	WIN32_FILE_ATTRIBUTE_DATA data;
 #else
 	struct stat st;
@@ -65,7 +65,7 @@ public:
 
 	FileInfo(Path path, bool follow_symlinks=true) {
 		if (!GetFileInfo(path, *this, follow_symlinks)) {
-#ifdef WIN32
+#ifdef _WIN32
 			throw FormatLastError("Failed to access %s",
 					      path.ToUTF8().c_str());
 #else
@@ -76,7 +76,7 @@ public:
 	}
 
 	bool IsRegular() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return (data.dwFileAttributes &
 			(FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) == 0;
 #else
@@ -85,7 +85,7 @@ public:
 	}
 
 	bool IsDirectory() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
 #else
 		return S_ISDIR(st.st_mode);
@@ -93,7 +93,7 @@ public:
 	}
 
 	uint64_t GetSize() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return ConstructUint64(data.nFileSizeLow, data.nFileSizeHigh);
 #else
 		return st.st_size;
@@ -101,14 +101,14 @@ public:
 	}
 
 	time_t GetModificationTime() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return FileTimeToTimeT(data.ftLastWriteTime);
 #else
 		return st.st_mtime;
 #endif
 	}
 
-#ifndef WIN32
+#ifndef _WIN32
 	uid_t GetUid() const {
 		return st.st_uid;
 	}
@@ -130,7 +130,7 @@ public:
 inline bool
 GetFileInfo(Path path, FileInfo &info, bool follow_symlinks=true)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)follow_symlinks;
 	return GetFileAttributesEx(path.c_str(), GetFileExInfoStandard,
 				   &info.data);

src/fs/FileSystem.cxx

@@ -29,7 +29,7 @@
 void
 RenameFile(Path oldpath, Path newpath)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	if (!MoveFileEx(oldpath.c_str(), newpath.c_str(),
 			MOVEFILE_REPLACE_EXISTING))
 		throw MakeLastError("Failed to rename file");
@@ -42,7 +42,7 @@ RenameFile(Path oldpath, Path newpath)
 AllocatedPath
 ReadLink(Path path)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)path;
 	errno = EINVAL;
 	return AllocatedPath::Null();
@@ -63,7 +63,7 @@ ReadLink(Path path)
 void
 TruncateFile(Path path)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE h = CreateFile(path.c_str(), GENERIC_WRITE, 0, nullptr,
 			      TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL,
 			      nullptr);
@@ -83,7 +83,7 @@ TruncateFile(Path path)
 void
 RemoveFile(Path path)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	if (!DeleteFile(path.c_str()))
 		throw FormatLastError("Failed to delete %s", path.c_str());
 #else

src/fs/FileSystem.hxx

@@ -26,7 +26,7 @@
 
 #include "Path.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <fileapi.h>
 #endif
 
@@ -43,7 +43,7 @@ class AllocatedPath;
 static inline FILE *
 FOpen(Path file, PathTraitsFS::const_pointer_type mode)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return _tfopen(file.c_str(), mode);
 #else
 	return fopen(file.c_str(), mode);
@@ -56,7 +56,7 @@ FOpen(Path file, PathTraitsFS::const_pointer_type mode)
 static inline int
 OpenFile(Path file, int flags, int mode)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return _topen(file.c_str(), flags, mode);
 #else
 	return open_cloexec(file.c_str(), flags, mode);
@@ -71,7 +71,7 @@ OpenFile(Path file, int flags, int mode)
 void
 RenameFile(Path oldpath, Path newpath);
 
-#ifndef WIN32
+#ifndef _WIN32
 
 /**
  * Wrapper for stat() that uses #Path names.
@@ -107,7 +107,7 @@ RemoveFile(Path path);
 AllocatedPath
 ReadLink(Path path);
 
-#ifndef WIN32
+#ifndef _WIN32
 
 static inline bool
 MakeFifo(Path path, mode_t mode)
@@ -132,7 +132,7 @@ CheckAccess(Path path, int mode)
 static inline bool
 FileExists(Path path, bool follow_symlinks = true)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)follow_symlinks;
 
 	const auto a = GetFileAttributes(path.c_str());
@@ -150,7 +150,7 @@ FileExists(Path path, bool follow_symlinks = true)
 static inline bool
 DirectoryExists(Path path, bool follow_symlinks = true)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)follow_symlinks;
 
 	const auto a = GetFileAttributes(path.c_str());
@@ -167,7 +167,7 @@ DirectoryExists(Path path, bool follow_symlinks = true)
 static inline bool
 PathExists(Path path)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return GetFileAttributes(path.c_str()) != INVALID_FILE_ATTRIBUTES;
 #else
 	return CheckAccess(path, F_OK);

src/fs/Glob.hxx

@@ -26,7 +26,7 @@
 #define HAVE_CLASS_GLOB
 #include <string>
 #include <fnmatch.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #define HAVE_CLASS_GLOB
 #include <string>
 #include <shlwapi.h>
@@ -40,12 +40,12 @@
  * (asterisk and question mark).
  */
 class Glob {
-#if defined(HAVE_FNMATCH) || defined(WIN32)
+#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	std::string pattern;
 #endif
 
 public:
-#if defined(HAVE_FNMATCH) || defined(WIN32)
+#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	explicit Glob(const char *_pattern)
 		:pattern(_pattern) {}
 
@@ -57,7 +57,7 @@ public:
 	bool Check(const char *name_fs) const noexcept {
 #ifdef HAVE_FNMATCH
 		return fnmatch(pattern.c_str(), name_fs, 0) == 0;
-#elif defined(WIN32)
+#elif defined(_WIN32)
 		return PathMatchSpecA(name_fs, pattern.c_str());
 #endif
 	}

src/fs/Limits.hxx

@@ -25,7 +25,7 @@
 #include <stddef.h>
 #include <limits.h>
 
-#if defined(WIN32)
+#if defined(_WIN32)
 static constexpr size_t MPD_PATH_MAX = 260;
 #elif defined(MAXPATHLEN)
 static constexpr size_t MPD_PATH_MAX = MAXPATHLEN;

src/fs/StandardDirectory.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 
 // Use X Desktop guidelines where applicable
-#if !defined(__APPLE__) && !defined(WIN32) && !defined(ANDROID)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(ANDROID)
 #define USE_XDG
 #endif
 
@@ -29,7 +29,7 @@
 
 #include <array>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #include <shlobj.h>
 #else
@@ -53,7 +53,7 @@
 #include "Main.hxx"
 #endif
 
-#if !defined(WIN32) && !defined(ANDROID)
+#if !defined(_WIN32) && !defined(ANDROID)
 class PasswdEntry
 {
 #if defined(HAVE_GETPWNAM_R) || defined(HAVE_GETPWUID_R)
@@ -113,7 +113,7 @@ SafePathFromFS(PathTraitsFS::const_pointer_type dir)
 }
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 static AllocatedPath GetStandardDir(int folder_id)
 {
 	std::array<PathTraitsFS::value_type, MAX_PATH> dir;
@@ -226,7 +226,7 @@ try {
 AllocatedPath
 GetUserConfigDir() noexcept
 {
-#if defined(WIN32)
+#if defined(_WIN32)
 	return GetStandardDir(CSIDL_LOCAL_APPDATA);
 #elif defined(USE_XDG)
 	// Check for $XDG_CONFIG_HOME
@@ -251,7 +251,7 @@ GetUserConfigDir() noexcept
 AllocatedPath
 GetUserMusicDir() noexcept
 {
-#if defined(WIN32)
+#if defined(_WIN32)
 	return GetStandardDir(CSIDL_MYMUSIC);	
 #elif defined(USE_XDG)
 	return GetUserDir("XDG_MUSIC_DIR");
@@ -287,7 +287,7 @@ GetUserCacheDir() noexcept
 #endif
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 AllocatedPath
 GetSystemConfigDir() noexcept

src/fs/StandardDirectory.hxx

@@ -42,7 +42,7 @@ gcc_pure
 AllocatedPath
 GetUserCacheDir() noexcept;
 
-#ifdef WIN32
+#ifdef _WIN32
 
 /**
  * Obtains system configuration directory.

src/fs/Traits.cxx

@@ -78,7 +78,7 @@ GetParentPathImpl(typename Traits::const_pointer_type p)
 		return typename Traits::string(Traits::CURRENT_DIRECTORY);
 	if (sep == p)
 		return typename Traits::string(p, p + 1);
-#ifdef WIN32
+#ifdef _WIN32
 	if (Traits::IsDrive(p) && sep == p + 2)
 		return typename Traits::string(p, p + 3);
 #endif

src/fs/Traits.hxx

@@ -25,7 +25,7 @@
 #include "util/StringPointer.hxx"
 #include "util/StringAPI.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "util/CharUtil.hxx"
 #include <tchar.h>
 #endif
@@ -34,7 +34,7 @@
 
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define PATH_LITERAL(s) _T(s)
 #else
 #define PATH_LITERAL(s) (s)
@@ -44,7 +44,7 @@
  * This class describes the nature of a native filesystem path.
  */
 struct PathTraitsFS {
-#ifdef WIN32
+#ifdef _WIN32
 	typedef std::wstring string;
 #else
 	typedef std::string string;
@@ -55,7 +55,7 @@ struct PathTraitsFS {
 	typedef Pointer::pointer_type pointer_type;
 	typedef Pointer::const_pointer_type const_pointer_type;
 
-#ifdef WIN32
+#ifdef _WIN32
 	static constexpr value_type SEPARATOR = '\\';
 #else
 	static constexpr value_type SEPARATOR = '/';
@@ -65,7 +65,7 @@ struct PathTraitsFS {
 
 	static constexpr bool IsSeparator(value_type ch) noexcept {
 		return
-#ifdef WIN32
+#ifdef _WIN32
 			ch == '/' ||
 #endif
 			ch == SEPARATOR;
@@ -78,7 +78,7 @@ struct PathTraitsFS {
 		assert(p != nullptr);
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 		const_pointer_type pos = p + GetLength(p);
 		while (p != pos && !IsSeparator(*pos))
 			--pos;
@@ -88,7 +88,7 @@ struct PathTraitsFS {
 #endif
 	}
 
-#ifdef WIN32
+#ifdef _WIN32
 	gcc_pure gcc_nonnull_all
 	static constexpr bool IsDrive(const_pointer_type p) noexcept {
 		return IsAlphaASCII(p[0]) && p[1] == ':';
@@ -102,7 +102,7 @@ struct PathTraitsFS {
 		assert(p != nullptr);
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 		if (IsDrive(p) && IsSeparator(p[2]))
 			return true;
 #endif
@@ -188,7 +188,7 @@ struct PathTraitsUTF8 {
 		return strrchr(p, SEPARATOR);
 	}
 
-#ifdef WIN32
+#ifdef _WIN32
 	gcc_pure gcc_nonnull_all
 	static constexpr bool IsDrive(const_pointer_type p) noexcept {
 		return IsAlphaASCII(p[0]) && p[1] == ':';
@@ -202,7 +202,7 @@ struct PathTraitsUTF8 {
 		assert(p != nullptr);
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 		if (IsDrive(p) && IsSeparator(p[2]))
 			return true;
 #endif

src/fs/io/FileOutputStream.cxx

@@ -43,7 +43,7 @@ FileOutputStream::FileOutputStream(Path _path, Mode _mode)
 	}
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 inline void
 FileOutputStream::OpenCreate(gcc_unused bool visible)
@@ -223,7 +223,7 @@ FileOutputStream::Commit()
 #endif
 
 	if (!Close()) {
-#ifdef WIN32
+#ifdef _WIN32
 		throw FormatLastError("Failed to commit %s",
 				      path.ToUTF8().c_str());
 #else

src/fs/io/FileOutputStream.hxx

@@ -25,14 +25,14 @@
 #include "fs/AllocatedPath.hxx"
 #include "Compiler.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include "system/FileDescriptor.hxx"
 #endif
 
 #include <assert.h>
 #include <stdint.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -41,7 +41,7 @@ class Path;
 class FileOutputStream final : public OutputStream {
 	const AllocatedPath path;
 
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE handle = INVALID_HANDLE_VALUE;
 #else
 	FileDescriptor fd = FileDescriptor::Undefined();
@@ -116,7 +116,7 @@ private:
 	bool Close() {
 		assert(IsDefined());
 
-#ifdef WIN32
+#ifdef _WIN32
 		CloseHandle(handle);
 		handle = INVALID_HANDLE_VALUE;
 		return true;
@@ -125,7 +125,7 @@ private:
 #endif
 	}
 
-#ifdef WIN32
+#ifdef _WIN32
 	bool SeekEOF() {
 		return SetFilePointer(handle, 0, nullptr,
 				      FILE_END) != 0xffffffff;
@@ -133,7 +133,7 @@ private:
 #endif
 
 	bool IsDefined() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return handle != INVALID_HANDLE_VALUE;
 #else
 		return fd.IsDefined();

src/fs/io/FileReader.cxx

@@ -24,7 +24,7 @@
 
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 
 FileReader::FileReader(Path _path)
 	:path(_path),

src/fs/io/FileReader.hxx

@@ -25,11 +25,11 @@
 #include "fs/AllocatedPath.hxx"
 #include "Compiler.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include "system/FileDescriptor.hxx"
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -39,7 +39,7 @@ class FileInfo;
 class FileReader final : public Reader {
 	AllocatedPath path;
 
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE handle;
 #else
 	FileDescriptor fd;
@@ -48,7 +48,7 @@ class FileReader final : public Reader {
 public:
 	explicit FileReader(Path _path);
 
-#ifdef WIN32
+#ifdef _WIN32
 	FileReader(FileReader &&other)
 		:path(std::move(other.path)),
 		 handle(other.handle) {
@@ -70,7 +70,7 @@ public:
 
 protected:
 	bool IsDefined() const {
-#ifdef WIN32
+#ifdef _WIN32
 		return handle != INVALID_HANDLE_VALUE;
 #else
 		return fd.IsDefined();
@@ -78,7 +78,7 @@ protected:
 	}
 
 public:
-#ifndef WIN32
+#ifndef _WIN32
 	FileDescriptor GetFD() const {
 		return fd;
 	}
@@ -90,7 +90,7 @@ public:
 
 	gcc_pure
 	uint64_t GetSize() const noexcept {
-#ifdef WIN32
+#ifdef _WIN32
 		LARGE_INTEGER size;
 		return GetFileSizeEx(handle, &size)
 			? size.QuadPart
@@ -102,7 +102,7 @@ public:
 
 	gcc_pure
 	uint64_t GetPosition() const noexcept {
-#ifdef WIN32
+#ifdef _WIN32
 		LARGE_INTEGER zero;
 		zero.QuadPart = 0;
 		LARGE_INTEGER position;

src/input/InputPlugin.hxx

@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 /* damn you, windows.h! */
 #ifdef ERROR

src/input/plugins/CurlInputPlugin.cxx

@@ -227,7 +227,7 @@ CurlInputStream::OnHeaders(unsigned status,
 
 		if (i != headers.end()) {
 			size_t icy_metaint = ParseUint64(i->second.c_str());
-#ifndef WIN32
+#ifndef _WIN32
 			/* Windows doesn't know "%z" */
 			FormatDebug(curl_domain, "icy-metaint=%zu", icy_metaint);
 #endif
@@ -414,7 +414,7 @@ CurlInputStream::SeekInternal(offset_type new_offset)
 
 	if (offset > 0) {
 		char range[32];
-#ifdef WIN32
+#ifdef _WIN32
 		// TODO: what can we use on Windows to format 64 bit?
 		sprintf(range, "%lu-", (long)offset);
 #else

src/lib/icu/CaseFold.cxx

@@ -36,7 +36,7 @@
 #include <ctype.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "Win32.hxx"
 #include <windows.h>
 #endif
@@ -73,7 +73,7 @@ try {
 	folded.SetSize(folded_length);
 	return UCharToUTF8({folded.begin(), folded.size()});
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 	const auto u = MultiByteToWideChar(CP_UTF8, src);
 
 	const int size = LCMapStringEx(LOCALE_NAME_INVARIANT,

src/lib/icu/Collate.cxx

@@ -32,7 +32,7 @@
 #include <ctype.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "Win32.hxx"
 #include "util/AllocatedString.hxx"
 #include <windows.h>
@@ -103,7 +103,7 @@ IcuCollate(const char *a, const char *b) noexcept
 	}
 #endif
 
-#elif defined(WIN32)
+#elif defined(_WIN32)
 	AllocatedString<wchar_t> wa = nullptr, wb = nullptr;
 
 	try {

src/lib/upnp/Action.hxx

@@ -22,7 +22,7 @@
 
 #include "Compiler.h"
 
-#include <upnp/upnptools.h>
+#include <upnptools.h>
 
 static inline constexpr unsigned
 CountNameValuePairs()

src/lib/upnp/Callback.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_UPNP_CALLBACK_HXX
 #define MPD_UPNP_CALLBACK_HXX
 
-#include <upnp/upnp.h>
+#include <upnp.h>
 
 /**
  * A class that is supposed to be used for libupnp asynchronous

src/lib/upnp/ClientInit.cxx

@@ -24,7 +24,7 @@
 #include "thread/Mutex.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <upnp/upnptools.h>
+#include <upnptools.h>
 
 #include <assert.h>
 

src/lib/upnp/ClientInit.hxx

@@ -22,7 +22,7 @@
 
 #include "check.h"
 
-#include <upnp/upnp.h>
+#include <upnp.h>
 
 void
 UpnpClientGlobalInit(UpnpClient_Handle &handle);

src/lib/upnp/Compat.hxx

@@ -20,15 +20,18 @@
 #ifndef MPD_UPNP_COMPAT_HXX
 #define MPD_UPNP_COMPAT_HXX
 
-#include <upnp/upnp.h>
+#include <upnp.h>
 
 #if UPNP_VERSION < 10800
-#include "Compiler.h"
-
 /* emulate the libupnp 1.8 API with older versions */
 
 using UpnpDiscovery = Upnp_Discovery;
 
+#endif
+
+#if UPNP_VERSION < 10624
+#include "Compiler.h"
+
 gcc_pure
 static inline int
 UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept

src/lib/upnp/ContentDirectoryService.hxx

@@ -22,7 +22,7 @@
 
 #include "Compiler.h"
 
-#include <upnp/upnp.h>
+#include <upnp.h>
 
 #include <string>
 #include <list>

src/lib/upnp/Discovery.cxx

@@ -24,7 +24,7 @@
 #include "util/ScopeExit.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <upnp/upnptools.h>
+#include <upnptools.h>
 
 #include <stdlib.h>
 #include <string.h>

src/lib/upnp/Discovery.hxx

@@ -27,7 +27,7 @@
 #include "thread/Mutex.hxx"
 #include "Compiler.h"
 
-#include <upnp/upnp.h>
+#include <upnp.h>
 
 #include <list>
 #include <vector>

src/lib/upnp/Init.cxx

@@ -22,9 +22,9 @@
 #include "thread/Mutex.hxx"
 #include "util/RuntimeError.hxx"
 
-#include <upnp/upnp.h>
+#include <upnp.h>
-#include <upnp/upnptools.h>
+#include <upnptools.h>
-#include <upnp/ixml.h>
+#include <ixml.h>
 
 #include <assert.h>
 

src/lib/upnp/UniqueIxml.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_UPNP_UNIQUE_XML_HXX
 #define MPD_UPNP_UNIQUE_XML_HXX
 
-#include <upnp/ixml.h>
+#include <ixml.h>
 
 #include <memory>
 

src/lib/upnp/ixmlwrap.hxx

@@ -17,7 +17,7 @@
 #ifndef _IXMLWRAP_H_INCLUDED_
 #define _IXMLWRAP_H_INCLUDED_
 
-#include <upnp/ixml.h>
+#include <ixml.h>
 
 #include <string>
 

src/mixer/plugins/AlsaMixerPlugin.cxx

@@ -292,7 +292,9 @@ AlsaMixer::SetVolume(unsigned volume)
 {
 	assert(handle != nullptr);
 
-	int err = set_normalized_playback_volume(elem, 0.01*volume, 1);
+	double cur = get_normalized_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT);
+	int delta = volume - lrint(100.*cur);
+	int err = set_normalized_playback_volume(elem, cur + 0.01*delta, delta);
 	if (err < 0)
 		throw FormatRuntimeError("failed to set ALSA volume: %s",
 					 snd_strerror(err));

src/net/Resolver.cxx

@@ -23,7 +23,7 @@
 
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #else
 #include <sys/types.h>

src/net/SocketAddress.hxx

@@ -34,7 +34,7 @@
 
 #include <cstddef>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
@@ -45,7 +45,7 @@
  */
 class SocketAddress {
 public:
-#ifdef WIN32
+#ifdef _WIN32
 	typedef int size_type;
 #else
 	typedef socklen_t size_type;

src/net/SocketError.cxx

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 
 SocketErrorMessage::SocketErrorMessage(socket_error_t code) noexcept
 {

src/net/SocketError.hxx

@@ -23,7 +23,7 @@
 #include "Compiler.h"
 #include "system/Error.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 typedef DWORD socket_error_t;
 #else
@@ -35,7 +35,7 @@ gcc_pure
 static inline socket_error_t
 GetSocketError() noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return WSAGetLastError();
 #else
 	return errno;
@@ -46,7 +46,7 @@ gcc_const
 static inline bool
 IsSocketErrorAgain(socket_error_t code) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return code == WSAEINPROGRESS;
 #else
 	return code == EAGAIN;
@@ -57,7 +57,7 @@ gcc_const
 static inline bool
 IsSocketErrorInterruped(socket_error_t code) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return code == WSAEINTR;
 #else
 	return code == EINTR;
@@ -68,7 +68,7 @@ gcc_const
 static inline bool
 IsSocketErrorClosed(socket_error_t code) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return code == WSAECONNRESET;
 #else
 	return code == EPIPE || code == ECONNRESET;
@@ -81,7 +81,7 @@ IsSocketErrorClosed(socket_error_t code) noexcept
  * and this class hosts the buffer.
  */
 class SocketErrorMessage {
-#ifdef WIN32
+#ifdef _WIN32
 	char msg[256];
 #else
 	const char *const msg;
@@ -99,7 +99,7 @@ gcc_const
 static inline std::system_error
 MakeSocketError(socket_error_t code, const char *msg) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return MakeLastError(code, msg);
 #else
 	return MakeErrno(code, msg);

src/net/ToString.cxx

@@ -34,7 +34,7 @@
 
 #include <algorithm>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #else
 #include <netdb.h>

src/output/Source.cxx

@@ -142,7 +142,8 @@ AudioOutputSource::GetChunkData(const MusicChunk &chunk,
 		replay_gain_filter_set_mode(*replay_gain_filter,
 					    replay_gain_mode);
 
-		if (chunk.replay_gain_serial != *replay_gain_serial_p) {
+		if (chunk.replay_gain_serial != *replay_gain_serial_p &&
+		    chunk.replay_gain_serial != MusicChunk::IGNORE_REPLAY_GAIN) {
 			replay_gain_filter_set_info(*replay_gain_filter,
 						    chunk.replay_gain_serial != 0
 						    ? &chunk.replay_gain_info

src/output/plugins/OSXOutputPlugin.cxx

@@ -36,9 +36,10 @@
 
 #include <memory>
 
+static constexpr unsigned MPD_OSX_BUFFER_TIME_MS = 100;
+
 struct OSXOutput {
 	AudioOutput base;
-
 	/* configuration settings */
 	OSType component_subtype;
 	/* only applicable with kAudioUnitSubType_HALOutput */
@@ -693,7 +694,9 @@ osx_output_open(AudioOutput *ao, AudioFormat &audio_format)
 					 errormsg);
 	}
 
-	od->ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(buffer_frame_size);
+	size_t ring_buffer_size = std::max<size_t>(buffer_frame_size,
+						   MPD_OSX_BUFFER_TIME_MS * audio_format.GetFrameSize() * audio_format.sample_rate / 1000);
+	od->ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(ring_buffer_size);
 
 	status = AudioOutputUnitStart(od->au);
 	if (status != 0) {
@@ -717,7 +720,7 @@ osx_output_delay(AudioOutput *ao) noexcept
 	OSXOutput *od = (OSXOutput *)ao;
 	return od->ring_buffer->write_available()
 		? std::chrono::steady_clock::duration::zero()
-		: std::chrono::milliseconds(25);
+		: std::chrono::milliseconds(MPD_OSX_BUFFER_TIME_MS / 4);
 }
 
 int

src/pcm/SampleFormat.hxx

@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 /* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
@@ -57,7 +57,7 @@ enum class SampleFormat : uint8_t {
 	DSD,
 };
 
-#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
+#if defined(_WIN32) && GCC_CHECK_VERSION(4,6)
 #pragma GCC diagnostic pop
 #endif
 

src/player/Thread.cxx

@@ -558,8 +558,10 @@ Player::SendSilence()
 	   partial frames */
 	unsigned num_frames = sizeof(chunk->data) / frame_size;
 
+	chunk->bit_rate = 0;
 	chunk->time = SignedSongTime::Negative(); /* undefined time stamp */
 	chunk->length = num_frames * frame_size;
+	chunk->replay_gain_serial = MusicChunk::IGNORE_REPLAY_GAIN;
 	PcmSilence({chunk->data, chunk->length}, play_audio_format.format);
 
 	try {

src/queue/PlaylistControl.cxx

@@ -75,8 +75,7 @@ playlist::MoveOrderToCurrent(unsigned old_order)
 	} else {
 		/* not playing anything: move the specified song to
 		   the front */
-		queue.SwapOrders(old_order, 0);
+		return queue.MoveOrderBefore(old_order, 0);
-		return 0;
 	}
 }
 

src/queue/PlaylistEdit.cxx

@@ -112,7 +112,7 @@ playlist::AppendSong(PlayerControl &pc, DetachedSong &&song)
 		else
 			start = current + 1;
 		if (start < queue.GetLength())
-			queue.ShuffleOrderLast(start, queue.GetLength());
+			queue.ShuffleOrderLastWithPriority(start, queue.GetLength());
 	}
 
 	UpdateQueuedSong(pc, queued_song);

src/queue/Queue.cxx

@@ -364,8 +364,20 @@ Queue::ShuffleOrderFirst(unsigned start, unsigned end)
 }
 
 void
-Queue::ShuffleOrderLast(unsigned start, unsigned end)
+Queue::ShuffleOrderLastWithPriority(unsigned start, unsigned end)
 {
+	assert(end <= length);
+	assert(start < end);
+
+	/* skip all items at the start which have a higher priority,
+	   because the last item shall only be shuffled within its
+	   priority group */
+	const auto last_priority = items[OrderToPosition(end - 1)].priority;
+	while (items[OrderToPosition(start)].priority != last_priority) {
+		++start;
+		assert(start < end);
+	}
+
 	rand.AutoCreate();
 
 	std::uniform_int_distribution<unsigned> distribution(start, end - 1);

src/queue/Queue.hxx

@@ -356,11 +356,12 @@ struct Queue {
 	void ShuffleOrderFirst(unsigned start, unsigned end);
 
 	/**
-	 * Shuffles the virtual order of the last song in the specified
+	 * Shuffles the virtual order of the last song in the
-	 * (order) range.  This is used in random mode after a song has been
+	 * specified (order) range; only songs which match this song's
-	 * appended by queue_append().
+	 * priority are considered.  This is used in random mode after
+	 * a song has been appended by Append().
 	 */
-	void ShuffleOrderLast(unsigned start, unsigned end);
+	void ShuffleOrderLastWithPriority(unsigned start, unsigned end);
 
 	/**
 	 * Shuffles a (position) range in the queue.  The songs are physically

src/storage/StorageState.cxx

@@ -0,0 +1,138 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Save and load mounts of the compound storage to/from the state file.
+ *
+ */
+
+#include "config.h"
+#include "StorageState.hxx"
+#include "fs/io/TextFile.hxx"
+#include "fs/io/BufferedOutputStream.hxx"
+#include "storage/Registry.hxx"
+#include "storage/CompositeStorage.hxx"
+#include "db/plugins/simple/SimpleDatabasePlugin.hxx"
+#include "util/StringCompare.hxx"
+#include "util/Domain.hxx"
+#include "Instance.hxx"
+#include "IOThread.hxx"
+#include "Log.hxx"
+
+#include <list>
+#include <boost/crc.hpp>
+
+#define MOUNT_STATE_BEGIN        "mount_begin"
+#define MOUNT_STATE_END          "mount_end"
+#define MOUNT_STATE_STORAGE_URI  "uri: "
+#define MOUNT_STATE_MOUNTED_URL  "mounted_url: "
+
+static constexpr Domain storage_domain("storage");
+
+void
+storage_state_save(BufferedOutputStream &os, const Instance &instance)
+{
+	const auto visitor = [&os](const char *mount_uri, const Storage &storage) {
+		std::string uri = storage.MapUTF8("");
+		if (uri.empty() || StringIsEmpty(mount_uri))
+			return;
+
+		os.Format(
+			MOUNT_STATE_BEGIN "\n"
+			MOUNT_STATE_STORAGE_URI "%s\n"
+			MOUNT_STATE_MOUNTED_URL "%s\n"
+			MOUNT_STATE_END "\n", mount_uri, uri.c_str());
+	};
+
+	((CompositeStorage*)instance.storage)->VisitMounts(visitor);
+}
+
+bool
+storage_state_restore(const char *line, TextFile &file, Instance &instance)
+{
+	if (!StringStartsWith(line, MOUNT_STATE_BEGIN))
+		return false;
+
+	std::string url;
+	std::string uri;
+	const char* value;
+
+	while ((line = file.ReadLine()) != nullptr) {
+		if (StringStartsWith(line, MOUNT_STATE_END))
+			break;
+
+		if ((value = StringAfterPrefix(line, MOUNT_STATE_MOUNTED_URL)))
+			url = value;
+		else if ((value = StringAfterPrefix(line, MOUNT_STATE_STORAGE_URI)))
+			uri = value;
+		else
+			FormatError(storage_domain, "Unrecognized line in mountpoint state: %s", line);
+	}
+
+	if (url.empty() || uri.empty()) {
+		LogError(storage_domain, "Missing value in mountpoint state.");	
+		return true;
+	}
+
+	FormatDebug(storage_domain, "Restoring mount %s => %s", uri.c_str(), url.c_str());
+
+	auto &event_loop = io_thread_get();
+	Storage *storage = CreateStorageURI(event_loop, url.c_str());
+	if (storage == nullptr) {
+		FormatError(storage_domain, "Unrecognized storage URI: %s", url.c_str());
+		return true;
+	}
+
+#ifdef ENABLE_DATABASE
+	Database *db = instance.database;
+	if (db != nullptr && db->IsPlugin(simple_db_plugin)) {
+		try {
+			((SimpleDatabase *)db)->Mount(uri.c_str(), url.c_str());
+		} catch (...) {
+			throw;
+		}
+	}
+#endif
+
+	((CompositeStorage*)instance.storage)->Mount(uri.c_str(), storage);
+
+	return true;
+}
+
+unsigned
+storage_state_get_hash(const Instance &instance)
+{
+	std::list<std::string> mounts;
+
+	const auto visitor = [&mounts](const char *mount_uri, const Storage &storage) {
+		mounts.push_back(std::string(mount_uri) + ":" + storage.MapUTF8(""));
+	};
+
+	((CompositeStorage*)instance.storage)->VisitMounts(visitor);
+
+	mounts.sort();
+
+	boost::crc_32_type result;
+
+	for (auto mount: mounts) {
+		result.process_bytes(mount.c_str(), mount.length());
+	}
+
+	return result.checksum();
+}

src/storage/StorageState.hxx

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Saving and loading the playlist to/from the state file.
+ *
+ */
+
+#ifndef MPD_STORAGE_STATE_HXX
+#define MPD_STORAGE_STATE_HXX
+
+struct Instance;
+class BufferedOutputStream;
+class TextFile;
+
+void
+storage_state_save(BufferedOutputStream &os, const Instance &instance);
+
+bool
+storage_state_restore(const char *line, TextFile &file, Instance &instance);
+
+/**
+ * Generates a hash number for the current state of the composite storage.
+ * This is used by timer_save_state_file() to determine whether the state
+ * has changed and the state file should be saved.
+ */
+unsigned
+storage_state_get_hash(const Instance &instance);
+
+#endif

src/storage/plugins/LocalStorage.cxx

@@ -86,7 +86,7 @@ Stat(Path path, bool follow)
 
 	info.size = src.GetSize();
 	info.mtime = src.GetModificationTime();
-#ifdef WIN32
+#ifdef _WIN32
 	info.device = info.inode = 0;
 #else
 	info.device = src.GetDevice();

src/system/Clock.cxx

@@ -19,7 +19,7 @@
 
 #include "Clock.hxx"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 
 gcc_const

src/system/Clock.hxx

@@ -22,7 +22,7 @@
 
 #include "Compiler.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 /**
  * Returns the uptime of the current process in seconds.

src/system/EPollFD.cxx

@@ -22,7 +22,7 @@
 #include "EPollFD.hxx"
 #include "FatalError.hxx"
 
-#ifdef __BIONIC__
+#if defined(__BIONIC__) && __ANDROID_API__ < 21
 
 #include <sys/syscall.h>
 #include <fcntl.h>

src/system/Error.hxx

@@ -47,7 +47,7 @@ FormatSystemError(std::error_code code, const char *fmt, Args&&... args)
 	return std::system_error(code, buffer);
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include <windows.h>
 
@@ -90,7 +90,7 @@ FormatLastError(const char *fmt, Args&&... args)
 			       std::forward<Args>(args)...);
 }
 
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #include <errno.h>
 #include <string.h>
@@ -106,7 +106,7 @@ FormatLastError(const char *fmt, Args&&... args)
 static inline const std::error_category &
 ErrnoCategory()
 {
-#ifdef WIN32
+#ifdef _WIN32
 	/* on Windows, the generic_category() is used for errno
 	   values */
 	return std::generic_category();
@@ -151,7 +151,7 @@ gcc_pure
 static inline bool
 IsFileNotFound(const std::system_error &e) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return e.code().category() == std::system_category() &&
 		e.code().value() == ERROR_FILE_NOT_FOUND;
 #else
@@ -164,7 +164,7 @@ gcc_pure
 static inline bool
 IsPathNotFound(const std::system_error &e) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return e.code().category() == std::system_category() &&
 		e.code().value() == ERROR_PATH_NOT_FOUND;
 #else
@@ -177,7 +177,7 @@ gcc_pure
 static inline bool
 IsAccessDenied(const std::system_error &e) noexcept
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return e.code().category() == std::system_category() &&
 		e.code().value() == ERROR_ACCESS_DENIED;
 #else

src/system/EventPipe.cxx

@@ -26,19 +26,19 @@
 #include <assert.h>
 #include <unistd.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <winsock2.h>
 #include <cstring> /* for memset() */
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 static bool PoorSocketPair(int fd[2]);
 #endif
 
 EventPipe::EventPipe()
 {
-#ifdef WIN32
+#ifdef _WIN32
 	bool success = PoorSocketPair(fds);
 #else
 	bool success = pipe_cloexec_nonblock(fds) >= 0;
@@ -49,7 +49,7 @@ EventPipe::EventPipe()
 
 EventPipe::~EventPipe()
 {
-#ifdef WIN32
+#ifdef _WIN32
 	closesocket(fds[0]);
 	closesocket(fds[1]);
 #else
@@ -65,7 +65,7 @@ EventPipe::Read()
 	assert(fds[1] >= 0);
 
 	char buffer[256];
-#ifdef WIN32
+#ifdef _WIN32
 	return recv(fds[0], buffer, sizeof(buffer), 0) > 0;
 #else
 	return read(fds[0], buffer, sizeof(buffer)) > 0;
@@ -78,14 +78,14 @@ EventPipe::Write()
 	assert(fds[0] >= 0);
 	assert(fds[1] >= 0);
 
-#ifdef WIN32
+#ifdef _WIN32
 	send(fds[1], "", 1, 0);
 #else
 	gcc_unused ssize_t nbytes = write(fds[1], "", 1);
 #endif
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 static void SafeCloseSocket(SOCKET s)
 {

src/system/FatalError.cxx

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <errno.h>
@@ -61,7 +61,7 @@ FormatFatalError(const char *fmt, ...)
 	Abort();
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 
 void
 FatalSystemError(const char *msg, DWORD code)
@@ -79,7 +79,7 @@ FatalSystemError(const char *msg, DWORD code)
 void
 FatalSystemError(const char *msg)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	FatalSystemError(msg, GetLastError());
 #else
 	const char *system_error = strerror(errno);

src/system/FatalError.hxx

@@ -23,7 +23,7 @@
 #include "check.h"
 #include "Compiler.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windef.h>
 #endif
 
@@ -47,7 +47,7 @@ gcc_noreturn
 void
 FatalSystemError(const char *msg);
 
-#ifdef WIN32
+#ifdef _WIN32
 
 gcc_noreturn
 void

src/system/FileDescriptor.cxx

@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <poll.h>
 #endif
 
@@ -70,7 +70,7 @@ FileDescriptor::OpenReadOnly(const char *pathname) noexcept
 	return Open(pathname, O_RDONLY);
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 
 bool
 FileDescriptor::OpenNonBlocking(const char *pathname) noexcept
@@ -184,7 +184,7 @@ FileDescriptor::GetSize() const noexcept
 		: -1;
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 
 int
 FileDescriptor::Poll(short events, int timeout) const noexcept