summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-09-21 15:19:49 +0200
committerMax Kellermann <max@musicpd.org>2020-09-21 15:20:02 +0200
commitbc47a16943b9eacf5e2cf18eea50e314cf98dd50 (patch)
treecc49dd04b0c2f9db22ae22e3f4ec142b9e1a2f54
parent5130acf3ea06c827a423feae7dc68a00d4620018 (diff)
parent566787f0412a6c3b22083055938323867c44f6c4 (diff)
Merge tag 'v0.21.26' into master
release v0.21.26
-rw-r--r--NEWS2
-rw-r--r--src/archive/plugins/Iso9660ArchivePlugin.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 3203abefa..f16f0f456 100644
--- a/NEWS
+++ b/NEWS
@@ -40,7 +40,7 @@ ver 0.22 (not yet released)
* switch to C++17
- GCC 7 or clang 4 (or newer) recommended
-ver 0.21.26 (not yet released)
+ver 0.21.26 (2020/09/21)
* database
- inotify: obey ".mpdignore" files
* output
diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
index 0217faddc..915857bb7 100644
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -34,12 +34,11 @@
#include <cdio/iso9660.h>
#include <array>
+#include <utility>
#include <stdlib.h>
#include <string.h>
-#include <utility>
-
struct Iso9660 {
iso9660_t *const iso;