diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-06-12 10:24:52 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-06-12 10:24:52 (GMT) |
| commit | 54c2c72784e51a1065fe5395429bc99b05cb62e8 (patch) | |
| tree | 9cc94e8464ccedcfab9a93faa54b28857dc8549d | |
| parent | ff26c7e0f2d5abaf68604bbb3a9d15aacc61f6a5 (diff) | |
| download | tcl-54c2c72784e51a1065fe5395429bc99b05cb62e8.zip tcl-54c2c72784e51a1065fe5395429bc99b05cb62e8.tar.gz tcl-54c2c72784e51a1065fe5395429bc99b05cb62e8.tar.bz2 | |
Silence various warnings when doing a 64-bit build with MSVC: Those warnings can only _really_ be fixed in "novem" (so, don't silence them there)
| -rw-r--r-- | win/tclWinPort.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 987d45b..b545a09 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -350,9 +350,9 @@ typedef DWORD_PTR * PDWORD_PTR; #if defined(_MSC_VER) || defined(__MINGW32__) # define environ _environ -# if defined(_MSC_VER) && (_MSC_VER < 1600) +# if defined(_MSC_VER) && (_MSC_VER < 1600) # define hypot _hypot -# endif +# endif # define exception _exception # undef EDEADLOCK # if defined(__MINGW32__) && !defined(__MSVCRT__) @@ -381,8 +381,10 @@ typedef DWORD_PTR * PDWORD_PTR; * including the *printf family and others. Tell it to shut up. * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0) */ -#if _MSC_VER >= 1400 -#pragma warning(disable:4996) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +# pragma warning(disable:4244) +# pragma warning(disable:4267) +# pragma warning(disable:4996) #endif |