summaryrefslogtreecommitdiffstats
path: root/win/tkWinX.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-31 12:41:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-31 12:41:48 (GMT)
commit3f2bd047306169e148056331830dfb214349fb71 (patch)
tree2b5a0b3cbfc5581e6d160bfd15c479799e692d07 /win/tkWinX.c
parente60c6c5d7af1eb749f10bb6e36aefcf3e21c1e1d (diff)
parent31c2a87428c8648983c3500fc9dc48bfb99c873e (diff)
downloadtk-3f2bd047306169e148056331830dfb214349fb71.zip
tk-3f2bd047306169e148056331830dfb214349fb71.tar.gz
tk-3f2bd047306169e148056331830dfb214349fb71.tar.bz2
merge trunk
Diffstat (limited to 'win/tkWinX.c')
-rw-r--r--win/tkWinX.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c
index e85b7e7..22edb60 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -120,20 +120,19 @@ TkGetServerInfo(
Tk_Window tkwin) /* Token for window; this selects a particular
* display and server. */
{
- char buffer[60];
OSVERSIONINFO os;
os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&os);
- sprintf(buffer, "Windows %d.%d %d %s", (int)os.dwMajorVersion,
- (int)os.dwMinorVersion, (int)os.dwBuildNumber,
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf("Windows %d.%d %d %s",
+ (int) os.dwMajorVersion, (int) os.dwMinorVersion,
+ (int) os.dwBuildNumber,
#ifdef _WIN64
"Win64"
#else
"Win32"
#endif
- );
- Tcl_SetResult(interp, buffer, TCL_VOLATILE);
+ ));
}
/*