diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-17 17:03:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-17 17:03:49 (GMT) |
| commit | 37cc146f7519bf3d0dda8573a541121f0465b035 (patch) | |
| tree | 54011944ce4bd3b97d05673852e00cd673cf9b4e | |
| parent | 9abf419e0a98d9899afc590df3592a4238c3ac13 (diff) | |
| download | tcl-37cc146f7519bf3d0dda8573a541121f0465b035.zip tcl-37cc146f7519bf3d0dda8573a541121f0465b035.tar.gz tcl-37cc146f7519bf3d0dda8573a541121f0465b035.tar.bz2 | |
Fix [42b8083613]
| -rw-r--r-- | win/tclWinFile.c | 4 | ||||
| -rw-r--r-- | win/tclWinPort.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 1d9f93a..31fa603 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -18,6 +18,10 @@ #include <shlobj.h> #include <lm.h> /* For TclpGetUserHome(). */ +#if defined(_MSC_VER) +# define vsnprintf _vsnprintf +#endif + /* * The number of 100-ns intervals between the Windows system epoch (1601-01-01 * on the proleptic Gregorian calendar) and the Posix epoch (1970-01-01). diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 026cf9e..61f149b 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -466,16 +466,12 @@ 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 defined(_MSC_VER) -# if _MSC_VER >= 1400 -# pragma warning(disable:4244) -# pragma warning(disable:4267) -# pragma warning(disable:4996) -# endif -# define vsnprintf _vsnprintf +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +# pragma warning(disable:4244) +# pragma warning(disable:4267) +# pragma warning(disable:4996) #endif - /* *--------------------------------------------------------------------------- * The following macros and declarations represent the interface between |