diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
| commit | b607687a3182ef2fa9955d71abe86b31bdc1f99f (patch) | |
| tree | 388b6fa3c4ee2a38114208d8f8faab751ae23361 /core | |
| parent | 58cda02a389759d18176216c06f375d364cefef1 (diff) | |
| parent | 4ff524b5c9227d0eeae2a8d9761add7465c03710 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/math_funcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 6a60a7f790..c98a088912 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -136,7 +136,7 @@ public: static int b; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1800 __asm fld a __asm fistp b /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) @@ -148,7 +148,7 @@ public: : "=m" (b) : "m" (a));*/ #else - b=lrintf(a); //assuming everything but msvc has lrint + b=lrintf(a); //assuming everything but msvc 2012 or earlier has lrint #endif return b; } |