summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-13 20:59:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-13 20:59:03 (GMT)
commit52482ab5023994148201c6b4e71c40b62809b205 (patch)
treeac8f6f5963d03d0930dc5a0e3942baa89ecd916c /generic
parent5faa1ee9e67769d4c91ffc6fcee8270a5db4d66c (diff)
downloadtk-52482ab5023994148201c6b4e71c40b62809b205.zip
tk-52482ab5023994148201c6b4e71c40b62809b205.tar.gz
tk-52482ab5023994148201c6b4e71c40b62809b205.tar.bz2
[Bug 3388350] mingw64 compiler warnings
Diffstat (limited to 'generic')
-rw-r--r--generic/tkBitmap.c4
-rw-r--r--generic/tkImgGIF.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index 173de25..5c8a9fc 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -24,7 +24,7 @@
* temporarily turn off that warning message.
*/
-#if defined(__WIN32__) || defined(_WIN32)
+#if defined(_MSC_VER)
#pragma warning (disable : 4305)
#endif
@@ -39,7 +39,7 @@
#include "question.bmp"
#include "warning.bmp"
-#if defined(__WIN32__) || defined(_WIN32)
+#if defined(_MSC_VER)
#pragma warning (default : 4305)
#endif
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c
index 9c2004a..bbb3178 100644
--- a/generic/tkImgGIF.c
+++ b/generic/tkImgGIF.c
@@ -807,8 +807,8 @@ ReadImage(interp, imagePtr, chan, len, rows, cmap,
int v;
int xpos = 0, ypos = 0, pass = 0, i;
register char *pixelPtr;
- CONST static int interlaceStep[] = { 8, 8, 4, 2 };
- CONST static int interlaceStart[] = { 0, 4, 2, 1 };
+ static CONST int interlaceStep[] = { 8, 8, 4, 2 };
+ static CONST int interlaceStart[] = { 0, 4, 2, 1 };
unsigned short prefix[(1 << MAX_LWZ_BITS)];
unsigned char append[(1 << MAX_LWZ_BITS)];
unsigned char stack[(1 << MAX_LWZ_BITS)*2];