Skip to content

M
mpd
Commit 38d263ac authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/sndio: work around a libroar C++ incompatibility

Same as in commit e02d8ad8, but this time for the sndio plugin which can be emulated by libroar.
parent f71c204e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
NEWS
View file @ 38d263ac
ver 0.20.4 (not yet released) ver 0.20.4 (not yet released)
* output
- sndio: work around a libroar C++ incompatibility
* workaround for GCC 4.9 "constexpr" bug * workaround for GCC 4.9 "constexpr" bug
* fix FreeBSD build failure * fix FreeBSD build failure
......
src/output/plugins/SndioOutputPlugin.cxx
View file @ 38d263ac
...@@ -24,8 +24,16 @@ ...@@ -24,8 +24,16 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.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> #include <sndio.h>
/* undo the libroar workaround */
#undef new
#include <stdexcept> #include <stdexcept>
#ifndef SIO_DEVANY #ifndef SIO_DEVANY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment