diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 09:56:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 09:56:19 (GMT) |
| commit | cac264cd19efaa76a0b0ab5a961401118cc4b432 (patch) | |
| tree | 6851eb74800f656256fe9adb264e4ecc93f3f5ce | |
| parent | fb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9 (diff) | |
| parent | c41f6053680bfa7bf4537af890349ddf5b543d33 (diff) | |
| download | tcl-cac264cd19efaa76a0b0ab5a961401118cc4b432.zip tcl-cac264cd19efaa76a0b0ab5a961401118cc4b432.tar.gz tcl-cac264cd19efaa76a0b0ab5a961401118cc4b432.tar.bz2 | |
Merge 8.5 (rename internal TCL_I_MODIFIER -> TCL_Z_MODIFIER)
| -rw-r--r-- | win/tclWinChan.c | 2 | ||||
| -rw-r--r-- | win/tclWinConsole.c | 2 | ||||
| -rw-r--r-- | win/tclWinInt.h | 19 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 2 | ||||
| -rw-r--r-- | win/tclWinSerial.c | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 4f210cb..573ac7d 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -1377,7 +1377,7 @@ TclWinOpenFileChannel( infoPtr->flags = appendMode; infoPtr->handle = handle; infoPtr->dirty = 0; - sprintf(channelName, "file%" TCL_I_MODIFIER "x", (size_t) infoPtr); + sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr); infoPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName, infoPtr, permissions); diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c index a223a1f..bb5166b 100644 --- a/win/tclWinConsole.c +++ b/win/tclWinConsole.c @@ -1332,7 +1332,7 @@ TclWinOpenConsoleChannel( * for instance). */ - sprintf(channelName, "file%" TCL_I_MODIFIER "x", (size_t) infoPtr); + sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr); infoPtr->channel = Tcl_CreateChannel(&consoleChannelType, channelName, infoPtr, permissions); diff --git a/win/tclWinInt.h b/win/tclWinInt.h index a44abd9..ac95da5 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -53,15 +53,18 @@ MODULE_SCOPE TclWinProcs tclWinProcs; #define VER_PLATFORM_WIN32_CE 3 #endif -#ifdef _WIN64 -#if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO -# define TCL_I_MODIFIER "ll" -#else -# define TCL_I_MODIFIER "I" -#endif -#else -# define TCL_I_MODIFIER "" +#ifndef TCL_Z_MODIFIER +# ifdef _WIN64 +# if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO +# define TCL_Z_MODIFIER "ll" +# else +# define TCL_Z_MODIFIER "I" +# endif +# else +# define TCL_Z_MODIFIER "" +# endif #endif +#define TCL_I_MODIFIER TCL_Z_MODIFIER /* * Declarations of functions that are not accessible by way of the diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 14ca9e3..00bc9fe 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -1834,7 +1834,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, infoPtr, infoPtr->validMask); diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 6946907..d7fa9f5 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -1456,7 +1456,7 @@ TclWinOpenSerialChannel( * are shared between multiple channels (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(&serialChannelType, channelName, infoPtr, permissions); |