summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-28 13:17:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-28 13:17:20 (GMT)
commitc519b824fa166cc910bc7ef59252c1c184e4ba84 (patch)
tree830a2c62e45769b190370415d4c1d7c1c0c7d759
parent4336f614ad52c35a1e41c9b1d737dd086ab85a83 (diff)
downloadtcl-c519b824fa166cc910bc7ef59252c1c184e4ba84.zip
tcl-c519b824fa166cc910bc7ef59252c1c184e4ba84.tar.gz
tcl-c519b824fa166cc910bc7ef59252c1c184e4ba84.tar.bz2
(cherry-pick from "fix-1997007" branch): fix typo- resp. copy-paste-bug (using wrong threadInfo pointer in ConsoleOutputProc, should be writer, not reader)
-rw-r--r--unix/tclUnixSock.c2
-rw-r--r--win/tclWinConsole.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index e8767e2..b9b6b53 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -713,7 +713,7 @@ IPv6AddressNeedsNumericRendering(
* at least some versions of OSX.
*/
-#pragma GCC diagnostic push
+#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
#pragma GCC diagnostic pop
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index ab55035..71facef 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -808,7 +808,7 @@ ConsoleOutputProc(
int *errorCode) /* Where to store error code. */
{
ConsoleInfo *infoPtr = instanceData;
- ConsoleThreadInfo *threadInfo = &infoPtr->reader;
+ ConsoleThreadInfo *threadInfo = &infoPtr->writer;
DWORD bytesWritten, timeout;
*errorCode = 0;