More fun with M_Pi on Windows

Author: madskjeldgaard

plugins/ChowDSP/iir.hpp

@@ -3,18 +3,7 @@
 #include <complex>
 /* #include <dsp/common.hpp> */
 #include <type_traits>
-
-// This is necessary to get M_PI to work on windows
-#ifndef M_PI
-namespace {
-const double M_PI = std::acos(-1.0);
-}
-#endif
-
-// Fucking Windows bollocks...
-#ifndef M_SQRT2
-namespace { const double M_SQRT2 = 1.41421356237309504880; }
-#endif
+#include "../constants.h"
 
 /** Digital IIR filter processor. Using TDF-II structure:
  * https://ccrma.stanford.edu/~jos/filters/Transposed_Direct_Forms.html

plugins/constants.h

@@ -1,13 +1,18 @@
 #pragma once
+
+// Fucking Windows bollocks...
+
 #include <cmath>
 #ifndef MK_CONSTANTS
 #define MK_CONSTANTS
 
 // This is necessary to get M_PI to work on windows
 #ifndef M_PI
-namespace {
-const double M_PI = std::acos(-1.0);
-}
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifndef M_SQRT2
+#define M_SQRT2 1.41421356237309504880
 #endif
 
 #endif

plugins/mutated/mi-resonator.hpp

@@ -34,6 +34,7 @@
 #include "math.h"
 #include "mi-lookuptables.h"
 #include <algorithm>
+#include "../constants.h"
 
 #pragma once
 
@@ -92,13 +93,6 @@ enum FilterMode {
   FILTER_MODE_HIGH_PASS
 };
 
-// This is necessary to get M_PI to work on windows
-#ifndef M_PI
-namespace {
-const double M_PI = std::acos(-1.0);
-}
-#endif
-
 #define M_PI_F float(M_PI)
 #define M_PI_POW_2 M_PI *M_PI
 #define M_PI_POW_3 M_PI_POW_2 *M_PI