From a92a71476f92c4499929c4235befc4156721cee3 Mon Sep 17 00:00:00 2001 From: MichaƂ Janiszewski Date: Jun 24 2016 08:35:50 +0000 Subject: isnan fix isnan is already defined on Linux in math.h, as included in: toonz/sources/include/tutil.h:7, toonz/sources/include/traster.h:6, toonz/sources/include/tcolorutils.h:9, toonz/sources/common/tapptools/tcolorutils.cpp:4: with type: constexpr bool std::isnan(double) --- diff --git a/toonz/sources/common/tapptools/tcolorutils.cpp b/toonz/sources/common/tapptools/tcolorutils.cpp index d05d375..95f375d 100644 --- a/toonz/sources/common/tapptools/tcolorutils.cpp +++ b/toonz/sources/common/tapptools/tcolorutils.cpp @@ -13,7 +13,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..3c17f21 100644 --- a/toonz/sources/stdfx/pins.cpp +++ b/toonz/sources/stdfx/pins.cpp @@ -10,7 +10,6 @@ #ifdef _WIN32 #define ISNAN _isnan #else -extern "C" int isnan(double); #define ISNAN isnan #endif