Merge tag 'v0.20.4'

release v0.20.4
2017-02-01 22:05:33 +01:00
parent 97132e3d38 0a033fb10a
commit df4af2b550
11 changed files with 58 additions and 42 deletions
@@ -24,8 +24,16 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"

+/* work around a C++ incompatibility if the sndio API is emulated by
+   libroar: libroar's "struct roar_service_stream" has a member named
+   "new", which is an illegal identifier in C++ */
+#define new new_
+
 #include <sndio.h>

+/* undo the libroar workaround */
+#undef new
+
 #include <stdexcept>

 #ifndef SIO_DEVANY