archive/iso9660: libcdio 2.0 compatibility

Closes #173

archive/iso9660: libcdio 2.0 compatibility
12fd1cad · Max Kellermann · e573cbf0 · 12fd1cad · 12fd1cad
Commit 12fd1cad authored Feb 03, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

NEWS NEWS +2 -0

Iso9660ArchivePlugin.cxx src/archive/plugins/Iso9660ArchivePlugin.cxx +5 -0

No files found.
--- 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)

--- 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 *