From 52482ab5023994148201c6b4e71c40b62809b205 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 13 Aug 2011 20:59:03 +0000
Subject: [Bug 3388350] mingw64 compiler warnings
---
ChangeLog | 7 +++++++
generic/tkBitmap.c | 4 ++--
generic/tkImgGIF.c | 4 ++--
win/tkWinColor.c | 54 +++++++++++++++++++++++++++---------------------------
win/tkWinX.c | 4 ++--
5 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dae090e..c5fe3af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tkBitmap.c: [Bug 3388350] mingw64 compiler warnings
+ * generic/tkImgGIF.c
+ * win/tkWinColor.c
+ * win/tkWinX.c
+
2011-07-28 Jan Nijtmans <nijtmans@users.sf.net>
* xlib/X11/Xutil.h: [Bug 3380684] XEmptyRegion prototype doesn't
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];
diff --git a/win/tkWinColor.c b/win/tkWinColor.c
index e81398f..d3b3cad 100644
--- a/win/tkWinColor.c
+++ b/win/tkWinColor.c
@@ -38,33 +38,33 @@ typedef struct {
static SystemColorEntry sysColors[] = {
- "3dDarkShadow", COLOR_3DDKSHADOW,
- "3dLight", COLOR_3DLIGHT,
- "ActiveBorder", COLOR_ACTIVEBORDER,
- "ActiveCaption", COLOR_ACTIVECAPTION,
- "AppWorkspace", COLOR_APPWORKSPACE,
- "Background", COLOR_BACKGROUND,
- "ButtonFace", COLOR_BTNFACE,
- "ButtonHighlight", COLOR_BTNHIGHLIGHT,
- "ButtonShadow", COLOR_BTNSHADOW,
- "ButtonText", COLOR_BTNTEXT,
- "CaptionText", COLOR_CAPTIONTEXT,
- "DisabledText", COLOR_GRAYTEXT,
- "GrayText", COLOR_GRAYTEXT,
- "Highlight", COLOR_HIGHLIGHT,
- "HighlightText", COLOR_HIGHLIGHTTEXT,
- "InactiveBorder", COLOR_INACTIVEBORDER,
- "InactiveCaption", COLOR_INACTIVECAPTION,
- "InactiveCaptionText", COLOR_INACTIVECAPTIONTEXT,
- "InfoBackground", COLOR_INFOBK,
- "InfoText", COLOR_INFOTEXT,
- "Menu", COLOR_MENU,
- "MenuText", COLOR_MENUTEXT,
- "Scrollbar", COLOR_SCROLLBAR,
- "Window", COLOR_WINDOW,
- "WindowFrame", COLOR_WINDOWFRAME,
- "WindowText", COLOR_WINDOWTEXT,
- NULL, 0
+ {"3dDarkShadow", COLOR_3DDKSHADOW},
+ {"3dLight", COLOR_3DLIGHT},
+ {"ActiveBorder", COLOR_ACTIVEBORDER},
+ {"ActiveCaption", COLOR_ACTIVECAPTION},
+ {"AppWorkspace", COLOR_APPWORKSPACE},
+ {"Background", COLOR_BACKGROUND},
+ {"ButtonFace", COLOR_BTNFACE},
+ {"ButtonHighlight", COLOR_BTNHIGHLIGHT},
+ {"ButtonShadow", COLOR_BTNSHADOW},
+ {"ButtonText", COLOR_BTNTEXT},
+ {"CaptionText", COLOR_CAPTIONTEXT},
+ {"DisabledText", COLOR_GRAYTEXT},
+ {"GrayText", COLOR_GRAYTEXT},
+ {"Highlight", COLOR_HIGHLIGHT},
+ {"HighlightText", COLOR_HIGHLIGHTTEXT},
+ {"InactiveBorder", COLOR_INACTIVEBORDER},
+ {"InactiveCaption", COLOR_INACTIVECAPTION},
+ {"InactiveCaptionText", COLOR_INACTIVECAPTIONTEXT},
+ {"InfoBackground", COLOR_INFOBK},
+ {"InfoText", COLOR_INFOTEXT},
+ {"Menu", COLOR_MENU},
+ {"MenuText", COLOR_MENUTEXT},
+ {"Scrollbar", COLOR_SCROLLBAR},
+ {"Window", COLOR_WINDOW},
+ {"WindowFrame", COLOR_WINDOWFRAME},
+ {"WindowText", COLOR_WINDOWTEXT},
+ {NULL, 0}
};
typedef struct ThreadSpecificData {
diff --git a/win/tkWinX.c b/win/tkWinX.c
index cafacb9..a592056 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -153,8 +153,8 @@ TkGetServerInfo(interp, tkwin)
os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&os);
- sprintf(buffer, "Windows %d.%d %d %s", os.dwMajorVersion,
- os.dwMinorVersion, os.dwBuildNumber,
+ sprintf(buffer, "Windows %d.%d %d %s", (int)os.dwMajorVersion,
+ (int)os.dwMinorVersion, (int)os.dwBuildNumber,
#ifdef _WIN64
"Win64"
#else
--
cgit v0.12