*** old/tclWinPort.h	2011-07-20 10:54:46.377512360 +0200
--- new/tclWinPort.h	2011-07-20 10:55:04.360672577 +0200
***************
*** 376,382 ****
  
  #if defined(_MSC_VER) || defined(__MINGW32__)
  #    define environ _environ
! #    define hypot _hypot
  #    define exception _exception
  #    undef EDEADLOCK
  #    if defined(__MINGW32__) && !defined(__MSVCRT__)
--- 376,384 ----
  
  #if defined(_MSC_VER) || defined(__MINGW32__)
  #    define environ _environ
! #    if (_MSC_VER < 1600)
! #       define hypot _hypot
! #    endif
  #    define exception _exception
  #    undef EDEADLOCK
  #    if defined(__MINGW32__) && !defined(__MSVCRT__)
