summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2011-07-21 16:36:49 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2011-07-21 16:36:49 (GMT)
commitc236d1c42bb1d5fd3f6b5037f0fa9ef9203eb3e4 (patch)
treed378b5cc15e600e89e85ea9ebf6c9e92123b1025
parent92e5225f3e58dced78ebcc4ae27b317fc763197b (diff)
parent1e3a88fef63ab971fb95870412cbb715657f04e3 (diff)
downloadtcl-c236d1c42bb1d5fd3f6b5037f0fa9ef9203eb3e4.zip
tcl-c236d1c42bb1d5fd3f6b5037f0fa9ef9203eb3e4.tar.gz
tcl-c236d1c42bb1d5fd3f6b5037f0fa9ef9203eb3e4.tar.bz2
[Bug 3372130] Fix hypot math function with MSVC10
FossilOrigin-Name: eb36f33d12d223b5a2ee172a4e33258489aa0b06
-rw-r--r--ChangeLog4
-rw-r--r--win/tclWinPort.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ae93bc..aad6742 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 4fe8754..ca58470 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -454,7 +454,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__)