| @@ -19,16 +19,9 @@ | |||||
| #ifdef WANT_LINUXSAMPLER | #ifdef WANT_LINUXSAMPLER | ||||
| // fix broken headers | |||||
| #define old__cplusplus __cplusplus | |||||
| #undef __cplusplus | |||||
| #include "linuxsampler/EngineFactory.h" | #include "linuxsampler/EngineFactory.h" | ||||
| #include <linuxsampler/Sampler.h> | #include <linuxsampler/Sampler.h> | ||||
| #define __cplusplus old__cplusplus | |||||
| #undef old__cplusplus | |||||
| namespace LinuxSampler { | namespace LinuxSampler { | ||||
| using CarlaBackend::CarlaEngine; | using CarlaBackend::CarlaEngine; | ||||
| @@ -36,12 +36,7 @@ | |||||
| # include <fluidsynth.h> | # include <fluidsynth.h> | ||||
| #endif | #endif | ||||
| #ifdef WANT_LINUXSAMPLER | #ifdef WANT_LINUXSAMPLER | ||||
| // fix broken headers | |||||
| # define TMP__cplusplus __cplusplus | |||||
| # undef __cplusplus | |||||
| # include "linuxsampler/EngineFactory.h" | # include "linuxsampler/EngineFactory.h" | ||||
| # define __cplusplus TMP__cplusplus | |||||
| # undef TMP__cplusplus | |||||
| #endif | #endif | ||||
| #include "juce_audio_basics.h" | #include "juce_audio_basics.h" | ||||