diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-20 11:43:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-20 11:43:28 (GMT) |
| commit | 1dd6a945f9e3a815d98802769aba7da38fbc2ae5 (patch) | |
| tree | 10e1cff358c65cd963e69e2dbde31847287c96f7 | |
| parent | 3eafe75fbc925da366e32a959d479a254ebfc02a (diff) | |
| parent | b033de4acf942697fce4f0e1131192fd61ef6abc (diff) | |
| download | tcl-1dd6a945f9e3a815d98802769aba7da38fbc2ae5.zip tcl-1dd6a945f9e3a815d98802769aba7da38fbc2ae5.tar.gz tcl-1dd6a945f9e3a815d98802769aba7da38fbc2ae5.tar.bz2 | |
[Bug 3605401]: Compiler error with latest mingw-w64 headers.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/tclWinDde.c | 8 | ||||
| -rw-r--r-- | win/tclWinReg.c | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2013-02-20 Jan Nijtmans <nijtmans@users.sf.net> + + * win/tclWinDde.c: [Bug 3605401]: Compiler error with latest mingw-w64 + headers. + 2013-02-19 Jan Nijtmans <nijtmans@users.sf.net> * generic/tclTrace.c: [Bug 2438181]: Incorrect error reporting in diff --git a/win/tclWinDde.c b/win/tclWinDde.c index d0600e6..ce0b413 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -11,8 +11,9 @@ */ #undef STATIC_BUILD -#undef USE_TCL_STUBS -#define USE_TCL_STUBS +#ifndef USE_TCL_STUBS +# define USE_TCL_STUBS +#endif #include "tclInt.h" #include <dde.h> #include <ddeml.h> @@ -385,7 +386,8 @@ DdeSetServerName( Tcl_DStringSetLength(&dString, offset + sizeof(TCHAR) * TCL_INTEGER_SPACE); actualName = (TCHAR *) Tcl_DStringValue(&dString); } - _stprintf((TCHAR *) (Tcl_DStringValue(&dString) + offset), TEXT("%d"), suffix); + _sntprintf((TCHAR *) (Tcl_DStringValue(&dString) + offset), + TCL_INTEGER_SPACE, TEXT("%d"), suffix); } /* diff --git a/win/tclWinReg.c b/win/tclWinReg.c index 6ac5caf..327e4a3 100644 --- a/win/tclWinReg.c +++ b/win/tclWinReg.c @@ -13,9 +13,9 @@ */ #undef STATIC_BUILD -#undef USE_TCL_STUBS -#define USE_TCL_STUBS - +#ifndef USE_TCL_STUBS +# define USE_TCL_STUBS +#endif #include "tclInt.h" #ifdef _MSC_VER # pragma comment (lib, "advapi32.lib") |