From 943bcc29cc05bc1d75df505cd259659a72dc56b1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 11 Jan 2014 15:02:10 -0500 Subject: [PATCH] fix issues with isnan/isinf on OS X where hides isnan/isinf and forces std::isnan/std::isinf --- gtk2_ardour/plugin_eq_gui.cc | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 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 +#include + #ifdef COMPILER_MSVC #include /* 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" - -#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" +#ifdef __APPLE__ +#define isinf(val) std::isinf((val)) +#define isnan(val) std::isnan((val)) +#endif #include #include #include -#include -#include +#include "ardour/audio_buffer.h" +#include "ardour/data_type.h" +#include "ardour/chan_mapping.h" +#include "ardour/session.h" + +#include "plugin_eq_gui.h" +#include "fft.h" +#include "ardour_ui.h" +#include "gui_thread.h" #include "i18n.h"