summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-02-04 22:45:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-02-04 22:45:59 (GMT)
commitb203ab7aabea8ebece5250e15db03f9c6f96c2b6 (patch)
tree431a3e4a40b1c759ee826f2954fb7ac70838c3a5 /generic/tclMain.c
parente9034f37542010a9dfeb054699ce1c9e74169f59 (diff)
parenteee14742522aed25744851879c80a96134de7369 (diff)
downloadtcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.zip
tcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.tar.gz
tcl-b203ab7aabea8ebece5250e15db03f9c6f96c2b6.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tclMain.c')
-rw-r--r--generic/tclMain.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c
index f85f8aa..c4afcd9 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -215,7 +215,7 @@ Tcl_GetStartupScript(
if (tsdPtr->encoding == NULL) {
*encodingPtr = NULL;
} else {
- *encodingPtr = Tcl_GetString(tsdPtr->encoding);
+ *encodingPtr = TclGetString(tsdPtr->encoding);
}
}
return tsdPtr->path;
@@ -343,7 +343,7 @@ Tcl_MainEx(
&& ('-' != argv[3][0])) {
Tcl_Obj *value = NewNativeObj(argv[2], -1);
Tcl_SetStartupScript(NewNativeObj(argv[3], -1),
- Tcl_GetString(value));
+ TclGetString(value));
Tcl_DecrRefCount(value);
argc -= 3;
argv += 3;
@@ -488,7 +488,7 @@ Tcl_MainEx(
Tcl_IncrRefCount(is.commandPtr);
}
length = Tcl_GetsObj(is.input, is.commandPtr);
- if (length == (size_t)-1) {
+ if (length == TCL_AUTO_LENGTH) {
if (Tcl_InputBlocked(is.input)) {
/*
* This can only happen if stdin has been set to
@@ -766,7 +766,7 @@ StdinProc(
Tcl_IncrRefCount(commandPtr);
}
length = Tcl_GetsObj(chan, commandPtr);
- if (length == (size_t)-1) {
+ if (length == TCL_AUTO_LENGTH) {
if (Tcl_InputBlocked(chan)) {
return;
}