From 5d7c7ca1685c81ead2302921bd820e5a0226f648 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 21 Jul 2011 16:19:11 +0000 Subject: [Bug 3372130] Fix hypot math function with MSVC10 FossilOrigin-Name: 29cb474297e6e2515c67f7260a9d7162a422c0a7 --- ChangeLog | 4 ++++ win/tclWinPort.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b5b1894..abfa48e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-07-21 Jan Nijtmans + + * win/tclWinPort.h: [Bug 3372130] Fix hypot math function with MSVC10 + 2011-07-15 Don Porter * generic/tclCompile.c: Avoid segfaults when RecordByteCodeStats() diff --git a/win/tclWinPort.h b/win/tclWinPort.h index f228a22..0073f15 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -389,7 +389,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__) -- cgit v0.12 From 9038874b87f1571c5eaa0695f0279e71d4ba3408 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 21 Jul 2011 16:27:02 +0000 Subject: oops, leftover end comment FossilOrigin-Name: f2bb3c845572cb2304c64cef31dfbf47291a6b37 --- win/tclWinPort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 0073f15..8d1ce68 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -391,7 +391,7 @@ # define environ _environ # if defined(_MSC_VER) && (_MSC_VER < 1600) # define hypot _hypot -# endif*/ +# endif # define exception _exception # undef EDEADLOCK # if defined(__MINGW32__) && !defined(__MSVCRT__) -- cgit v0.12