From bc8b18dbfd1870b5d17a90eabedf46c601c22312 Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka Date: Jun 24 2016 10:47:47 +0000 Subject: Merge pull request #518 from ideasman42/linux-isnan-pr Use cmath instead of defining isnan (Linux build-fix) --- diff --git a/toonz/sources/common/tapptools/tcolorutils.cpp b/toonz/sources/common/tapptools/tcolorutils.cpp index d05d375..3c5d2dc 100644 --- a/toonz/sources/common/tapptools/tcolorutils.cpp +++ b/toonz/sources/common/tapptools/tcolorutils.cpp @@ -6,6 +6,7 @@ #include #include +#include typedef float KEYER_FLOAT; @@ -13,7 +14,6 @@ typedef float KEYER_FLOAT; #ifdef _WIN32 #define ISNAN _isnan #else -extern "C" int isnan(double); #define ISNAN isnan #endif diff --git a/toonz/sources/stdfx/pins.cpp b/toonz/sources/stdfx/pins.cpp index b4ddf97..b72016e 100644 --- a/toonz/sources/stdfx/pins.cpp +++ b/toonz/sources/stdfx/pins.cpp @@ -6,11 +6,12 @@ #include "tmathutil.h" #include "tofflinegl.h" +#include + //------------------------------------------------------------------------------ #ifdef _WIN32 #define ISNAN _isnan #else -extern "C" int isnan(double); #define ISNAN isnan #endif