From 14b202843816e60463948d01114c86e7f1536bb2 Mon Sep 17 00:00:00 2001
From: Tobias Junghans <totimaju@gmail.com>
Date: Wed, 18 Oct 2017 08:00:40 +0200
Subject: [PATCH] LADSPA: CAPS: fix compilation with MinGW GCC >= 5.0

---
 plugins/LadspaEffect/caps/CMakeLists.txt | 2 +-
 plugins/LadspaEffect/caps/basics.h       | 8 ++------
 plugins/LadspaEffect/caps/dsp/windows.h  | 4 +++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt
index 0eff4d5cd..92f28478e 100644
--- a/plugins/LadspaEffect/caps/CMakeLists.txt
+++ b/plugins/LadspaEffect/caps/CMakeLists.txt
@@ -7,7 +7,7 @@ IF(LMMS_BUILD_WIN64)
 ADD_DEFINITIONS(-DLMMS_BUILD_WIN64)
 ENDIF(LMMS_BUILD_WIN64)
 SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings")
+SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings -std=c++11")
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET caps POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:caps>\")
diff --git a/plugins/LadspaEffect/caps/basics.h b/plugins/LadspaEffect/caps/basics.h
index df24e8c05..ca6a4fdf1 100644
--- a/plugins/LadspaEffect/caps/basics.h
+++ b/plugins/LadspaEffect/caps/basics.h
@@ -33,15 +33,11 @@
 #define _USE_GNU 1
 
 /* unlocking some standard math calls. */
-#define __USE_ISOC99 1
-#define __USE_ISOC9X 1
-#define _ISOC99_SOURCE 1
-#define _ISOC9X_SOURCE 1
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <math.h>
+#include <cmath>
 
 #include <assert.h>
 #include <stdio.h>
@@ -184,7 +180,7 @@ class Plugin {
 		inline sample_t getport_unclamped (int i)
 			{
 				sample_t v = *ports[i];
-				return (isinf (v) || isnan(v)) ? 0 : v;
+				return (std::isinf (v) || std::isnan(v)) ? 0 : v;
 			}
 
 		/* get port value and clamp to port range */
diff --git a/plugins/LadspaEffect/caps/dsp/windows.h b/plugins/LadspaEffect/caps/dsp/windows.h
index 949a95818..1f094c58d 100644
--- a/plugins/LadspaEffect/caps/dsp/windows.h
+++ b/plugins/LadspaEffect/caps/dsp/windows.h
@@ -28,6 +28,8 @@
 #ifndef _DSP_WINDOWS_H_ 
 #define _DSP_WINDOWS_H_
 
+#include <cmath>
+
 namespace DSP {
 	
 /* prototypes for window value application ... */
@@ -147,7 +149,7 @@ kaiser (sample_t * s, int n, double beta)
 		double k = besseli ((beta * sqrt (1 - pow ((2 * i / (n - 1)), 2)))) / bb;
 
 		/* can you spell hack */
-		if (!isfinite (k) || isnan(k))
+		if (std::isinf(k) || std::isnan(k))
 			k = 0;
 
 		F (s[si], k);