[Bug 3388350] mingw64 compiler warnings

4 files changed, 9 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index ada3045..b043b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2011-08-15  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tclWinPort.h:    [Bug 3388350] mingw64 compiler warnings
+	* win/tclWinFile.c
+	* win/tclWinPipe.c
+	* win/tclWinSock.c
 	* generic/tclPosixStr.c
 	* generic/tclStrToD.c
 
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 0291a41..271f41a 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -123,17 +123,17 @@ typedef struct _REPARSE_DATA_BUFFER {
 	    WORD PrintNameOffset;
 	    WORD PrintNameLength;
 	    ULONG Flags;
-	    WCHAR PathBuffer[1];
+	    WCHAR PathBuffer[2];
 	} SymbolicLinkReparseBuffer;
 	struct {
 	    WORD SubstituteNameOffset;
 	    WORD SubstituteNameLength;
 	    WORD PrintNameOffset;
 	    WORD PrintNameLength;
-	    WCHAR PathBuffer[1];
+	    WCHAR PathBuffer[2];
 	} MountPointReparseBuffer;
 	struct {
-	    BYTE DataBuffer[1];
+	    BYTE DataBuffer[2];
 	} GenericReparseBuffer;
     };
 } REPARSE_DATA_BUFFER;
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 4ed3558..b29dde4 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1647,7 +1647,6 @@ TclpCreateCommandChannel(
     Tcl_Pid *pidPtr)		/* An array of process identifiers. */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
-    int channelId;
     DWORD id;
     PipeInfo *infoPtr = (PipeInfo *) ckalloc((unsigned) sizeof(PipeInfo));
 
@@ -1666,20 +1665,6 @@ TclpCreateCommandChannel(
     infoPtr->writeError = 0;
     infoPtr->channel = (Tcl_Channel) NULL;
 
-    /*
-     * Use one of the fds associated with the channel as the channel id.
-     */
-
-    if (readFile) {
-	channelId = (int) ((WinFile*)readFile)->handle;
-    } else if (writeFile) {
-	channelId = (int) ((WinFile*)writeFile)->handle;
-    } else if (errorFile) {
-	channelId = (int) ((WinFile*)errorFile)->handle;
-    } else {
-	channelId = 0;
-    }
-
     infoPtr->validMask = 0;
 
     infoPtr->threadId = Tcl_GetCurrentThread();
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index b1298a8..a365b49 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1792,8 +1792,10 @@ TcpSetOptionProc(
     const char *optionName,	/* Name of the option to set. */
     const char *value)		/* New value for option. */
 {
+#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
     SocketInfo *infoPtr;
     SOCKET sock;
+#endif
 
     /*
      * Check that WinSock is initialized; do not call it if not, to prevent
@@ -1808,10 +1810,10 @@ TcpSetOptionProc(
 	return TCL_ERROR;
     }
 
+#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
     infoPtr = (SocketInfo *) instanceData;
     sock = infoPtr->socket;
 
-#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
     if (!strcasecmp(optionName, "-keepalive")) {
 	BOOL val = FALSE;
 	int boolVar, rtn;