diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-07-21 16:36:49 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-07-21 16:36:49 (GMT) |
commit | 72096946ccb5a10021b7bcf2ba22cd11ccdc1726 (patch) | |
tree | d378b5cc15e600e89e85ea9ebf6c9e92123b1025 | |
parent | 1cee989f7315e650af66b37d9d5a776683255005 (diff) | |
parent | 7441d4d95430c1fff6efe42569411d4cc98f23fb (diff) | |
download | tcl-72096946ccb5a10021b7bcf2ba22cd11ccdc1726.zip tcl-72096946ccb5a10021b7bcf2ba22cd11ccdc1726.tar.gz tcl-72096946ccb5a10021b7bcf2ba22cd11ccdc1726.tar.bz2 |
[Bug 3372130] Fix hypot math function with MSVC10
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | win/tclWinPort.h | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -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__) |