diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-01-03 02:32:44 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-01-03 02:32:44 +0400 |
| commit | 46a3752a1fbff37c69ffa94df8427a3c1236e873 (patch) | |
| tree | 7e3ac76ff5df2f6164afe1cee5eddad9285e56cd /source/blender/blenlib/BLI_math_base.h | |
| parent | 1c8a12ee61a00da103fe79bcc52f30a9a71bdc25 (diff) | |
Fix :I broke the build for MSVC 2008 this fixes it
Diffstat (limited to 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index e2a5672b7ea..f218554704d 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -143,27 +143,20 @@ static const int NAN_INT = 0x7FC00000; #define copysignf(a, b) ((float)copysign(a, b)) #endif -#else /* C99 or POSIX.1-2001 */ +#endif /* C99 or POSIX.1-2001 */ #ifdef WIN32 # ifndef FREE_WINDOWS -# ifndef isnan +# if (!defined isnan) && (_MSC_VER < 1800) # define isnan(n) _isnan(n) # endif -# ifndef hypot +# define finite _finite +# if (!defined hypot) && (_MSC_VER < 1800) # define hypot(a, b) _hypot(a, b) # endif # endif #endif -#endif /* C99 or POSIX.1-2001 */ - -#ifdef WIN32 -# ifndef FREE_WINDOWS -# define finite _finite -# endif -#endif - /* Causes warning: * incompatible types when assigning to type 'Foo' from type 'Bar' * ... the compiler optimizes away the temp var */ |