From f0ac2a42dacd012d571e820af585805230045d01 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 Aug 2011 06:57:45 +0000
Subject: [Bug 3388350] mingw64 compiler warnings

---
 ChangeLog           | 9 ++++++++-
 win/tclWinConsole.c | 4 +---
 win/tclWinDde.c     | 3 ---
 win/tclWinPipe.c    | 9 ---------
 win/tclWinSerial.c  | 4 +---
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 014f46a..54a718c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2011-08-05:  Kevin B. Kenny  <kennykb@acm.org>
+2011-08-09  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tclWinConsole.c: [Bug 3388350] mingw64 compiler warnings
+	* win/tclWinDde.c
+	* win/tclWinPipe.c
+	* win/tclWinSerial.c
+
+2011-08-05  Kevin B. Kenny  <kennykb@acm.org>
 
 	* generic/tclStrToD.c: Plugged a memory leak in double->string
 	conversion. [Bug 3386975]
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index b352bd6..ebba41a 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -1144,7 +1144,7 @@ ConsoleReaderThread(
 {
     ConsoleInfo *infoPtr = (ConsoleInfo *)arg;
     HANDLE *handle = infoPtr->handle;
-    DWORD count, waitResult;
+    DWORD waitResult;
     HANDLE wEvents[2];
 
     /* The first event takes precedence. */
@@ -1167,8 +1167,6 @@ ConsoleReaderThread(
 	    break;
 	}
 
-	count = 0;
-
 	/*
 	 * Look for data on the console, but first ignore any events that are
 	 * not KEY_EVENTs.
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index f61a0ba..df6507b 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -135,14 +135,11 @@ int
 Dde_Init(
     Tcl_Interp *interp)
 {
-    ThreadSpecificData *tsdPtr;
-
     if (!Tcl_InitStubs(interp, "8.0", 0)) {
 	return TCL_ERROR;
     }
 
     Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd, NULL, NULL);
-    tsdPtr = TCL_TSD_INIT(&dataKey);
     Tcl_CreateExitHandler(DdeExitProc, NULL);
     return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION);
 }
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index cf1cdb1..4ed3558 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -320,7 +320,6 @@ PipeSetupProc(
     PipeInfo *infoPtr;
     Tcl_Time blockTime = { 0, 0 };
     int block = 1;
-    WinFile *filePtr;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
     if (!(flags & TCL_FILE_EVENTS)) {
@@ -334,13 +333,11 @@ PipeSetupProc(
     for (infoPtr = tsdPtr->firstPipePtr; infoPtr != NULL;
 	    infoPtr = infoPtr->nextPtr) {
 	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    filePtr = (WinFile*) infoPtr->writeFile;
 	    if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
 		block = 0;
 	    }
 	}
 	if (infoPtr->watchMask & TCL_READABLE) {
-	    filePtr = (WinFile*) infoPtr->readFile;
 	    if (WaitForRead(infoPtr, 0) >= 0) {
 		block = 0;
 	    }
@@ -375,7 +372,6 @@ PipeCheckProc(
 {
     PipeInfo *infoPtr;
     PipeEvent *evPtr;
-    WinFile *filePtr;
     int needEvent;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -398,13 +394,11 @@ PipeCheckProc(
 	 */
 
 	needEvent = 0;
-	filePtr = (WinFile*) infoPtr->writeFile;
 	if ((infoPtr->watchMask & TCL_WRITABLE) &&
 		(WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT)) {
 	    needEvent = 1;
 	}
 
-	filePtr = (WinFile*) infoPtr->readFile;
 	if ((infoPtr->watchMask & TCL_READABLE) &&
 		(WaitForRead(infoPtr, 0) >= 0)) {
 	    needEvent = 1;
@@ -2292,7 +2286,6 @@ PipeEventProc(
 {
     PipeEvent *pipeEvPtr = (PipeEvent *)evPtr;
     PipeInfo *infoPtr;
-    WinFile *filePtr;
     int mask;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -2329,14 +2322,12 @@ PipeEventProc(
      * detected EOF.
      */
 
-    filePtr = (WinFile*) ((PipeInfo*)infoPtr)->writeFile;
     mask = 0;
     if ((infoPtr->watchMask & TCL_WRITABLE) &&
 	    (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT)) {
 	mask = TCL_WRITABLE;
     }
 
-    filePtr = (WinFile*) ((PipeInfo*)infoPtr)->readFile;
     if ((infoPtr->watchMask & TCL_READABLE) && (WaitForRead(infoPtr,0) >= 0)) {
 	if (infoPtr->readFlags & PIPE_EOF) {
 	    mask = TCL_READABLE;
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 927a8fd..bb26e23 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -1433,9 +1433,7 @@ TclWinSerialReopen(
     CONST TCHAR *name,
     DWORD access)
 {
-    ThreadSpecificData *tsdPtr;
-
-    tsdPtr = SerialInit();
+    SerialInit();
 
     /*
      * Multithreaded I/O needs the overlapped flag set otherwise
-- 
cgit v0.12