diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-28 13:21:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-28 13:21:26 (GMT) |
| commit | 10ab52081de15a7d8d038a07c17d1af4f48a6d22 (patch) | |
| tree | 745da7a28af4ec2ea21daf0e17e1751954d0505a | |
| parent | 0b9703a36fee900ad71e7b408cf41c93c6142306 (diff) | |
| parent | fecff1bcf0617bd35993cd9cb43a5f6a61618336 (diff) | |
| download | tcl-10ab52081de15a7d8d038a07c17d1af4f48a6d22.zip tcl-10ab52081de15a7d8d038a07c17d1af4f48a6d22.tar.gz tcl-10ab52081de15a7d8d038a07c17d1af4f48a6d22.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | unix/tclUnixSock.c | 2 | ||||
| -rw-r--r-- | win/tclWinConsole.c | 2 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 7a5497d..2353f94 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -743,7 +743,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 5ce8a2b..c97e3e4 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; diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 4666deb..4775418 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -1618,7 +1618,7 @@ TclpCreateCommandChannel( infoPtr->stopWriter = CreateEvent(NULL, TRUE, FALSE, NULL); infoPtr->writeThread = CreateThread(NULL, 256, PipeWriterThread, infoPtr, 0, &id); - SetThreadPriority(infoPtr->readThread, THREAD_PRIORITY_HIGHEST); + SetThreadPriority(infoPtr->writeThread, THREAD_PRIORITY_HIGHEST); infoPtr->validMask |= TCL_WRITABLE; } |