diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-13 21:51:23 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-13 21:51:23 (GMT) |
commit | 8ef38a7e1335498220c1dad6109c3f035f878ffa (patch) | |
tree | e9c2b607fa747c61a49074514454eb483ac3ea93 /generic | |
parent | b8d8c08583edeba5c3f7b6bce2e13c60c2323c47 (diff) | |
parent | 52482ab5023994148201c6b4e71c40b62809b205 (diff) | |
download | tk-8ef38a7e1335498220c1dad6109c3f035f878ffa.zip tk-8ef38a7e1335498220c1dad6109c3f035f878ffa.tar.gz tk-8ef38a7e1335498220c1dad6109c3f035f878ffa.tar.bz2 |
[Bug 3388350] mingw64 compiler warnings
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkBitmap.c | 4 | ||||
-rw-r--r-- | generic/tkConsole.c | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index 81e9678..09545d6 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 4091255..b10aaaf 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -81,6 +81,7 @@ static Tcl_ChannelType consoleChannelType = { NULL, /* handler proc. */ NULL, /* wide seek proc */ NULL, /* thread action proc */ + NULL }; #ifdef __WIN32__ @@ -111,25 +112,17 @@ ShouldUseConsoleChannel( DCB dcb; DWORD consoleParams; DWORD fileType; - int mode; - 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; |