Merge tag 'v0.20.6'

release v0.20.6
2017-03-10 17:02:32 +01:00
parent e9e853b19a a40510c241
commit e26d49efb7
12 changed files with 86 additions and 12 deletions
--- a/src/db/plugins/simple/Mount.cxx
+++ b/src/db/plugins/simple/Mount.cxx
@@ -25,6 +25,13 @@
 #include "db/Interface.hxx"
 #include "fs/Traits.hxx"

+#ifdef _LIBCPP_VERSION
+/* workaround for "error: incomplete type 'PlaylistInfo' used in type
+   trait expression" with libc++ version 3900 (from Android NDK
+   r13b) */
+#include "db/PlaylistInfo.hxx"
+#endif
+
 #include <string>

 struct PrefixedLightDirectory : LightDirectory {