summaryrefslogtreecommitdiffstats
path: root/win/tclWinPipe.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-22 09:23:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-22 09:23:49 (GMT)
commitc41f6053680bfa7bf4537af890349ddf5b543d33 (patch)
treefb97eb4ba3a7624a6e9faf5675c243c66fbcf231 /win/tclWinPipe.c
parente250b6f551523bf4b6fb9ae110bac1279d5eb581 (diff)
downloadtcl-c41f6053680bfa7bf4537af890349ddf5b543d33.zip
tcl-c41f6053680bfa7bf4537af890349ddf5b543d33.tar.gz
tcl-c41f6053680bfa7bf4537af890349ddf5b543d33.tar.bz2
(cherry-pick): Fix [c975939973]: Usage of gnu_printf in latest mingw-w64.
Change (internal, windows-only) TCL_I_MODIFIER to TCL_Z_MODIFIER, since that's how it's called in Tcl 8.7 and up
Diffstat (limited to 'win/tclWinPipe.c')
-rw-r--r--win/tclWinPipe.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index cdb955f..fd941d7 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1580,10 +1580,10 @@ QuoteCmdLinePart(
QuoteCmdLineBackslash(dsPtr, start, *bspos, NULL);
start = *bspos;
}
- /*
- * escape all special chars enclosed in quotes like `"..."`, note that here we
+ /*
+ * escape all special chars enclosed in quotes like `"..."`, note that here we
* don't must escape `\` (with `\`), because it's outside of the main quotes,
- * so `\` remains `\`, but important - not at end of part, because results as
+ * so `\` remains `\`, but important - not at end of part, because results as
* before the quote, so `%\%\` should be escaped as `"%\%"\\`).
*/
Tcl_DStringAppend(dsPtr, "\"", 1); /* opening escape quote-char */
@@ -1738,7 +1738,7 @@ BuildCommandLine(
special++;
}
/* rest of argument (and escape backslashes before closing main quote) */
- QuoteCmdLineBackslash(&ds, start, special,
+ QuoteCmdLineBackslash(&ds, start, special,
(quote & CL_QUOTE) ? bspos : NULL);
}
if (quote & CL_QUOTE) {
@@ -1836,7 +1836,7 @@ TclpCreateCommandChannel(
* unique, in case channels share handles (stdin/stdout).
*/
- sprintf(channelName, "file%" TCL_I_MODIFIER "x", (size_t)infoPtr);
+ sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t)infoPtr);
infoPtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
(ClientData) infoPtr, infoPtr->validMask);