diff options
Diffstat (limited to 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 54e9349f1f8..5f94f04e0a8 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -75,11 +75,6 @@ #define M_LN10 2.30258509299404568402 #endif -/* non-standard defines, used in some places */ -#ifndef MAXFLOAT -#define MAXFLOAT ((float)3.40282347e+38) -#endif - #if defined(__GNUC__) # define NAN_FLT __builtin_nanf("") #else @@ -147,13 +142,7 @@ static const int NAN_INT = 0x7FC00000; #ifdef WIN32 # if defined(_MSC_VER) -# if (_MSC_VER < 1800) && !defined(isnan) -# define isnan(n) _isnan(n) -# endif # define finite(n) _finite(n) -# if (_MSC_VER < 1800) && !defined(hypot) -# define hypot(a, b) _hypot(a, b) -# endif # endif #endif @@ -163,7 +152,7 @@ static const int NAN_INT = 0x7FC00000; #ifndef CHECK_TYPE #ifdef __GNUC__ #define CHECK_TYPE(var, type) { \ - __typeof(var) *__tmp; \ + typeof(var) *__tmp; \ __tmp = (type *)NULL; \ (void)__tmp; \ } (void)0 @@ -241,11 +230,6 @@ MINLINE int mod_i(int i, int n); MINLINE unsigned int highest_order_bit_i(unsigned int n); MINLINE unsigned short highest_order_bit_s(unsigned short n); -#if defined(_MSC_VER) && (_MSC_VER < 1800) -extern double copysign(double x, double y); -extern double round(double x); -#endif - double double_round(double x, int ndigits); #ifdef BLI_MATH_GCC_WARN_PRAGMA |