razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge remote-tracking branch 'my_github/isnan' into travis-base

Browse source
This commit is contained in:
Michał Janiszewski 2016-07-01 12:11:21 +02:00
commit 9258754773
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/common/tapptools/tcolorutils.cpp
View file

@ -14,7 +14,7 @@ typedef float KEYER_FLOAT;
#ifdef _WIN32 #ifdef _WIN32
#define ISNAN _isnan #define ISNAN _isnan
#else #else
#define ISNAN isnan #define ISNAN std::isnan
#endif #endif
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
toonz/sources/stdfx/pins.cpp
View file

@ -12,7 +12,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define ISNAN _isnan #define ISNAN _isnan
#else #else
#define ISNAN isnan #define ISNAN std::isnan
#endif #endif
namespace { namespace {