From 20b63ea6c4feea7d5e046509c243507f4ecd7b82 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 30 Jun 2014 23:19:04 -0400 Subject: [PATCH 1/2] Moved isnan/isinf compat code to lmms_math.h --- plugins/dynamics_processor/dynamics_processor.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/plugins/dynamics_processor/dynamics_processor.cpp b/plugins/dynamics_processor/dynamics_processor.cpp index e825cfe8d..9954c92e5 100644 --- a/plugins/dynamics_processor/dynamics_processor.cpp +++ b/plugins/dynamics_processor/dynamics_processor.cpp @@ -30,15 +30,6 @@ #include "embed.cpp" -#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) -#ifndef isnanf -#define isnanf(x) isnan(x) -#endif -#ifndef isinff -#define isinff(x) isinf(x) -#endif -#endif - extern "C" { From 63a5a16cd0de1047c2649e74ed0c64d87242088b Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 30 Jun 2014 23:21:17 -0400 Subject: [PATCH 2/2] isinf and isnan declarations win32/apple --- include/lmms_math.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/lmms_math.h b/include/lmms_math.h index 8f09a1b5a..0ec8ccc49 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -28,10 +28,20 @@ #include #include "lmms_constants.h" +#include "lmmsconfig.h" #include #include +#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) +#ifndef isnanf +#define isnanf(x) isnan(x) +#endif +#ifndef isinff +#define isinff(x) isinf(x) +#endif +#endif + #ifdef __INTEL_COMPILER static inline float absFraction( const float _x )