Merge pull request #2642 from giacomofiorin/mingw-m-pi

Lepton: define M_PI if needed with MingW (in addition to MSVC)

Merge pull request #2642 from giacomofiorin/mingw-m-pi
Lepton: define M_PI if needed with MingW (in addition to MSVC)
e703f76f · peastman · GitHub · e4a743ad · f2bb414f · e703f76f
Unverified Commit e703f76f authored Apr 13, 2020 by peastman Committed by GitHub Apr 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

libraries/lepton/src/MSVC_erfc.h libraries/lepton/src/MSVC_erfc.h +5 -1

No files found.
--- a/libraries/lepton/src/MSVC_erfc.h
+++ b/libraries/lepton/src/MSVC_erfc.h
@@ -8,9 +8,13 @@
 * (VC11 has _MSC_VER=1700).
 */

-#if defined(_MSC_VER) 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#if !defined(M_PI)
 #define M_PI 3.14159265358979323846264338327950288
+#endif
+#endif

+#if defined(_MSC_VER)
 #if _MSC_VER <= 1700 // 1700 is VC11, 1800 is VC12 
 /***************************
 *   erf.cpp