Merge branch 'v0.18.x'

2013-12-14 12:37:16 +01:00
parent d43aa12987 c170fed6f9
commit c7b1038a9d
12 changed files with 126 additions and 143 deletions
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -42,7 +42,12 @@
 #include <glib.h>
 #include <assert.h>

+#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/parannoia/paranoia.h>
+#else
 #include <cdio/paranoia.h>
+#endif
+
 #include <cdio/cd_types.h>

 struct CdioParanoiaInputStream {