Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2014-01-03 01:19:10 +0400
committerMartijn Berger <martijn.berger@gmail.com>2014-01-03 01:19:10 +0400
commit1c8a12ee61a00da103fe79bcc52f30a9a71bdc25 (patch)
treea2f7b158e96de33f64b2211d4cf0de4b1eaf4ca1 /intern/smoke
parentd0c6f14c73473579885ed0658dca3e3b6559ad2f (diff)
Fix T37987: MSVC 2013 has C99 headers and warns for out define hypot _hypot for good reason it seems
Diffstat (limited to 'intern/smoke')
-rw-r--r--intern/smoke/intern/tnt/tnt_math_utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/smoke/intern/tnt/tnt_math_utils.h b/intern/smoke/intern/tnt/tnt_math_utils.h
index e0bf4839733..d96a0aefcd7 100644
--- a/intern/smoke/intern/tnt/tnt_math_utils.h
+++ b/intern/smoke/intern/tnt/tnt_math_utils.h
@@ -7,7 +7,7 @@
/* needed for fabs, sqrt() below */
#include <cmath>
-#ifdef _WIN32
+#if (defined _WIN32) && (_MSC_VER < 1800)
#define hypot _hypot
#endif