From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001 From: Max Kellermann <max@musicpd.org> Date: Sat, 3 Feb 2018 19:32:31 +0100 Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility Closes #173 --- NEWS | 2 ++ src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 28b372ed2..4dee6cd35 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ ver 0.20.16 (not yet released) * database - simple: fix search within mount points - upnp: enable IPv6 +* archive + - iso9660: libcdio 2.0 compatibility * fix crash in debug build on Haiku and other operating systems ver 0.20.15 (2018/01/05) diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index 536745d85..363921527 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity, visitor.VisitArchiveEntry(path + 1); } } + +#if LIBCDIO_VERSION_NUM >= 20000 + iso9660_filelist_free(entlist); +#else _cdio_list_free (entlist, true); +#endif } static ArchiveFile *