diff options
| author | Max Kellermann <max@musicpd.org> | 2017-02-01 22:05:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-02-01 22:05:33 +0100 |
| commit | df4af2b5501f332db248aedd792c2b55789823c5 (patch) | |
| tree | e53a63614964da8dd8ddb699e68854ccd95a91f3 /src/output/plugins/SndioOutputPlugin.cxx | |
| parent | 97132e3d385ae84f7aaeb6c94f24d2cf41d39b9c (diff) | |
| parent | 0a033fb10aeca8bf6e6bfc9a2f9d9e793ee61ac9 (diff) | |
Merge tag 'v0.20.4'
release v0.20.4
Diffstat (limited to 'src/output/plugins/SndioOutputPlugin.cxx')
| -rw-r--r-- | src/output/plugins/SndioOutputPlugin.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/output/plugins/SndioOutputPlugin.cxx b/src/output/plugins/SndioOutputPlugin.cxx index 8c4a7327e..f8c154c1a 100644 --- a/src/output/plugins/SndioOutputPlugin.cxx +++ b/src/output/plugins/SndioOutputPlugin.cxx @@ -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 |