summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--win/tclWinPort.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5a3648..6d30bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-21 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tclWinPort.h: [Bug 3372130] Fix hypot math function with MSVC10
+
2011-07-19 Don Porter <dgp@users.sourceforge.net>
* generic/tclUtil.c: [Bug 3371644] Repair failure to properly handle
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 8fdf391..1c88ab2 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -411,7 +411,9 @@
#if defined(_MSC_VER) || defined(__MINGW32__)
# define environ _environ
-# define hypot _hypot
+# if defined(_MSC_VER) && (_MSC_VER < 1600)
+# define hypot _hypot
+# endif
# define exception _exception
# undef EDEADLOCK
# if defined(__MINGW32__) && !defined(__MSVCRT__)