diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-04 07:51:42 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-04 07:51:42 (GMT) |
| commit | 26ef4bacfbe3412a0343afe1cad4b94b321f1fc2 (patch) | |
| tree | b1a9d657111f70235f3894fdedc5c3a5d86ce480 /win/tclWinInit.c | |
| parent | 9d27c20d496ebe21ef04f49dc7b9c100a2de340e (diff) | |
| parent | 24ef33dc101a3e9114318b884c1e99d792f4739d (diff) | |
| download | tcl-26ef4bacfbe3412a0343afe1cad4b94b321f1fc2.zip tcl-26ef4bacfbe3412a0343afe1cad4b94b321f1fc2.tar.gz tcl-26ef4bacfbe3412a0343afe1cad4b94b321f1fc2.tar.bz2 | |
merge trunkdkf_notifier_poll
Diffstat (limited to 'win/tclWinInit.c')
| -rw-r--r-- | win/tclWinInit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/win/tclWinInit.c b/win/tclWinInit.c index fb53685..d89c98e 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -288,8 +288,6 @@ AppendEnvironment( */ if ((pathc > 0) && (lstrcmpiA(shortlib, pathv[pathc - 1]) != 0)) { - const char *str; - /* * TCL_LIBRARY is set but refers to a different tcl installation * than the current version. Try fiddling with the specified @@ -299,9 +297,8 @@ AppendEnvironment( pathv[pathc - 1] = shortlib; Tcl_DStringInit(&ds); - str = Tcl_JoinPath(pathc, pathv, &ds); - objPtr = Tcl_NewStringObj(str, Tcl_DStringLength(&ds)); - Tcl_DStringFree(&ds); + (void) Tcl_JoinPath(pathc, pathv, &ds); + objPtr = TclDStringToObj(&ds); } else { objPtr = Tcl_NewStringObj(buf, -1); } |