diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:02:10 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-11 15:02:10 -0500 |
| commit | 943bcc29cc05bc1d75df505cd259659a72dc56b1 (patch) | |
| tree | 5ca3f7a3fa85a4febf21ad454ebf514b3189ed29 /gtk2_ardour/plugin_eq_gui.cc | |
| parent | cf0f985bc48d4b790d3e55b925213ea7d6d313c8 (diff) | |
fix issues with isnan/isinf on OS X where <cmath> hides isnan/isinf and forces std::isnan/std::isinf
Diffstat (limited to 'gtk2_ardour/plugin_eq_gui.cc')
| -rw-r--r-- | gtk2_ardour/plugin_eq_gui.cc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index 9a91d0c124..306746d556 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -18,6 +18,9 @@ */ +#include <iostream> +#include <cmath> + #ifdef COMPILER_MSVC #include <float.h> /* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */ @@ -25,22 +28,24 @@ #define isnan(val) (bool)_isnan((double)val) #endif -#include "plugin_eq_gui.h" -#include "fft.h" +#ifdef __APPLE__ +#define isinf(val) std::isinf((val)) +#define isnan(val) std::isnan((val)) +#endif + +#include <gtkmm/box.h> +#include <gtkmm/button.h> +#include <gtkmm/checkbutton.h> -#include "ardour_ui.h" -#include "gui_thread.h" #include "ardour/audio_buffer.h" #include "ardour/data_type.h" #include "ardour/chan_mapping.h" #include "ardour/session.h" -#include <gtkmm/box.h> -#include <gtkmm/button.h> -#include <gtkmm/checkbutton.h> - -#include <iostream> -#include <cmath> +#include "plugin_eq_gui.h" +#include "fft.h" +#include "ardour_ui.h" +#include "gui_thread.h" #include "i18n.h" |