Merge branch 'windows+cc' into cairocanvas

[ardour.git] / gtk2_ardour / plugin_eq_gui.cc

diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index 4bf2a5f87913e8143b67c0bc9aa61446c84e9632..306746d55666614175e74b7577ad243f74996320 100644 (file)
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -18,33 +18,34 @@
 
 */
 
+#include <iostream>
+#include <cmath>
+
 #ifdef COMPILER_MSVC
 #include <float.h>
-
-// 'std::isinf()' and 'std::isnan()' are not available in MSVC.
+/* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */
 #define isinf(val) !((bool)_finite((double)val))
 #define isnan(val) (bool)_isnan((double)val)
-#else
-using std::isnan;
-using std::isinf;
 #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"