summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--generic/tkBitmap.c4
-rw-r--r--generic/tkConsole.c8
-rw-r--r--win/tkWinDialog.c3
-rw-r--r--win/tkWinSend.c3
-rw-r--r--win/tkWinSendCom.c3
6 files changed, 13 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 44cbba4..f9e4958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings
+ * generic/tkConsole.c
+ * win/tkWinDialog.c
+ * win/tkWinSend.c
+ * win/tkWinSendCom.c
+
2011-08-05 Don Porter <dgp@users.sourceforge.net>
*** 8.6b2 TAGGED FOR RELEASE ***
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index b641cb5..675a42a 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -23,7 +23,7 @@
* that warning message.
*/
-#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__GNUC__)
+#if defined(_MSC_VER)
#pragma warning (disable : 4305)
#endif
@@ -38,7 +38,7 @@
#include "question.xbm"
#include "warning.xbm"
-#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__GNUC__)
+#if defined(_MSC_VER)
#pragma warning (default : 4305)
#endif
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index e39caaa..a59092e 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -112,25 +112,17 @@ ShouldUseConsoleChannel(
DCB dcb;
DWORD consoleParams;
DWORD fileType;
- int mode;
- const char *bufMode;
HANDLE handle;
switch (type) {
case TCL_STDIN:
handleId = STD_INPUT_HANDLE;
- mode = TCL_READABLE;
- bufMode = "line";
break;
case TCL_STDOUT:
handleId = STD_OUTPUT_HANDLE;
- mode = TCL_WRITABLE;
- bufMode = "line";
break;
case TCL_STDERR:
handleId = STD_ERROR_HANDLE;
- mode = TCL_WRITABLE;
- bufMode = "none";
break;
default:
return 0;
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 06372be..ba4c2df 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -577,7 +577,7 @@ GetFileName(
OFNData ofnData;
int cdlgerr;
int filterIndex = 0, result = TCL_ERROR, winCode, oldMode, i, multi = 0;
- const char *extension = NULL, *filter = NULL, *title = NULL;
+ const char *extension = NULL, *title = NULL;
Tk_Window tkwin = clientData;
HWND hWnd;
Tcl_Obj *filterObj = NULL, *initialTypeObj = NULL, *typeVariableObj = NULL;
@@ -703,7 +703,6 @@ GetFileName(
&filterIndex) != TCL_OK) {
goto end;
}
- filter = Tcl_DStringValue(&utfFilterString);
Tk_MakeWindowExist(tkwin);
hWnd = Tk_GetHWND(Tk_WindowId(tkwin));
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 7fc7339..b3edc62 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.c
@@ -992,12 +992,11 @@ SendEventProc(
Tcl_Event *eventPtr,
int flags)
{
- int result = TCL_OK;
SendEvent *evPtr = (SendEvent *)eventPtr;
TRACE("SendEventProc\n");
- result = Tcl_EvalObjEx(evPtr->interp, evPtr->cmdPtr,
+ Tcl_EvalObjEx(evPtr->interp, evPtr->cmdPtr,
TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
Tcl_DecrRefCount(evPtr->cmdPtr);
diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c
index 77bc1b5..c67e533 100644
--- a/win/tkWinSendCom.c
+++ b/win/tkWinSendCom.c
@@ -372,7 +372,6 @@ Async(
UINT *puArgErr)
{
HRESULT hr = S_OK;
- int result = TCL_OK;
VARIANT vCmd;
VariantInit(&vCmd);
@@ -390,7 +389,7 @@ Async(
Tcl_Obj *scriptPtr = Tcl_NewUnicodeObj(vCmd.bstrVal,
(int) SysStringLen(vCmd.bstrVal));
- result = TkWinSend_QueueCommand(obj->interp, scriptPtr);
+ TkWinSend_QueueCommand(obj->interp, scriptPtr);
}
}