diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-07-27 17:26:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-07-27 17:26:36 (GMT) |
| commit | 505f8786aaa0f00791c0226f57253e431b80b57d (patch) | |
| tree | a3e087b34e48d167b13004ef21901441c1435c40 /win | |
| parent | e4b48a5d152b0559eb2a8836107bedb9684e9d87 (diff) | |
| parent | 14ad161abd380e690e0691879b23235ca74ab75e (diff) | |
| download | tcl-505f8786aaa0f00791c0226f57253e431b80b57d.zip tcl-505f8786aaa0f00791c0226f57253e431b80b57d.tar.gz tcl-505f8786aaa0f00791c0226f57253e431b80b57d.tar.bz2 | |
merge to rc
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinPort.h | 4 |
1 files changed, 3 insertions, 1 deletions
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__) |