diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/iksolver/intern/TNT/tntmath.h | 4 | ||||
| -rw-r--r-- | intern/smoke/intern/tnt/tnt_math_utils.h | 4 | ||||
| -rw-r--r-- | intern/string/STR_String.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/intern/iksolver/intern/TNT/tntmath.h b/intern/iksolver/intern/TNT/tntmath.h index 5773900caf9..55a79e2aba0 100644 --- a/intern/iksolver/intern/TNT/tntmath.h +++ b/intern/iksolver/intern/TNT/tntmath.h @@ -35,7 +35,9 @@ // conventional functions required by several matrix algorithms - +#ifdef _WIN32 +#define hypot _hypot +#endif namespace TNT { diff --git a/intern/smoke/intern/tnt/tnt_math_utils.h b/intern/smoke/intern/tnt/tnt_math_utils.h index 6e14a1d9b90..f6aad8eaf38 100644 --- a/intern/smoke/intern/tnt/tnt_math_utils.h +++ b/intern/smoke/intern/tnt/tnt_math_utils.h @@ -4,7 +4,9 @@ /* needed for fabs, sqrt() below */ #include <cmath> - +#ifdef _WIN32 +#define hypot _hypot +#endif namespace TNT { diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index a5e7a0721ec..d8023a06f81 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -54,6 +54,10 @@ using namespace std; #include "MEM_guardedalloc.h" #endif +#ifdef _WIN32 +#define stricmp _stricmp +#endif + class STR_String; typedef unsigned long dword; |