diff --git a/NEWS b/NEWS index 08266f358..14f3d0552 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,10 @@ ver 0.24 (not yet released) * static partition configuration * remove Haiku support +ver 0.23.10 (not yet released) +* Windows + - log to stdout by default, don't require "log_file" setting + ver 0.23.9 (2022/08/18) * input - cdio_paranoia: add options "mode" and "skip" diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 3586de703..33c51c4da 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="69" + android:versionName="0.23.10"> diff --git a/src/LogInit.cxx b/src/LogInit.cxx index 14799db2f..719ce3147 100644 --- a/src/LogInit.cxx +++ b/src/LogInit.cxx @@ -158,12 +158,15 @@ log_init(const ConfigData &config, bool verbose, bool use_stdout) getenv("NOTIFY_SOCKET") != nullptr) { /* if MPD was started as a systemd service, default to journal (which - is connected to fd=2) */ + is connected to stdout&stderr) */ out_fd = STDOUT_FILENO; return; } #endif -#ifndef HAVE_SYSLOG +#ifdef _WIN32 + /* default to stdout on Windows */ + out_fd = STDOUT_FILENO; +#elif !defined(HAVE_SYSLOG) throw std::runtime_error("config parameter 'log_file' not found"); #endif #ifdef HAVE_SYSLOG diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index 706a619c2..39aadd609 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -166,7 +166,7 @@ class Iso9660InputStream final : public InputStream { assert(fill <= data.size()); assert(position <= fill); - return {&data[position], &data[fill]}; + return {data.data() + position, data.data() + fill}; } void Consume(size_t nbytes) noexcept { diff --git a/test/net/meson.build b/test/net/meson.build index 00f35a194..ede17d09c 100644 --- a/test/net/meson.build +++ b/test/net/meson.build @@ -20,6 +20,7 @@ test( dependencies: [ net_dep, fs_dep, + util_dep, gtest_dep, ], ),