From 664a327665c85de251423f7a679879e8382041c8 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 16 Aug 2011 12:22:14 +0000 Subject: [Bug 3388350] mingw64 compiler warnings --- ChangeLog | 1 + win/tkWinWindow.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8510ee6..77b826a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * win/tkWinMenu.c * win/tkWinWm.c * win/tkWinX.c + * win/tkWindow.c * win/tcl.m4: Sync with win/tcl.m4 from Tcl * win/configure: (regenerated) * unix/tcl.m4: Sync with win/tcl.m4 from Tcl diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c index cd20aad..8d76289 100644 --- a/win/tkWinWindow.c +++ b/win/tkWinWindow.c @@ -207,7 +207,7 @@ TkpScanWindowId(interp, string, idPtr) Window *idPtr; /* Place to store converted result. */ { Tk_Window tkwin; - Window number; + VOID *number; /* * We want sscanf for the 64-bit check, but if that doesn't work, -- cgit v0.12 From 31e3c7c6744ec46a8b36c6425b93c58bd5e70230 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 16 Aug 2011 13:17:18 +0000 Subject: [Bug 3388350] mingw64 compiler warnings --- win/tkWinMenu.c | 8 ++++---- win/tkWinWm.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 3e9abe8..5ad29e1 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -440,7 +440,7 @@ TkpDestroyMenuEntry( Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } } - FreeID((WORD) PTR2UINT(mePtr->platformEntryData)); + FreeID((WORD) PTR2INT(mePtr->platformEntryData)); mePtr->platformEntryData = NULL; } @@ -629,7 +629,7 @@ ReconfigureWindowsMenu( flags |= MF_MENUBREAK; } - itemID = PTR2UINT(mePtr->platformEntryData); + itemID = PTR2INT(mePtr->platformEntryData); if ((mePtr->type == CASCADE_ENTRY) && (mePtr->childMenuRefPtr != NULL) && (mePtr->childMenuRefPtr->menuPtr != NULL)) { @@ -649,7 +649,7 @@ ReconfigureWindowsMenu( * If the MF_POPUP flag is set, then the id is interpreted * as the handle of a submenu. */ - itemID = PTR2UINT(childMenuHdl); + itemID = PTR2INT(childMenuHdl); } } if ((menuPtr->menuType == MENUBAR) @@ -860,7 +860,7 @@ TkpMenuNewEntry( Tcl_DoWhenIdle(ReconfigureWindowsMenu, (ClientData) menuPtr); } - mePtr->platformEntryData = (TkMenuPlatformEntryData) UINT2PTR(commandID); + mePtr->platformEntryData = (TkMenuPlatformEntryData) INT2PTR(commandID); return TCL_OK; } diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 23f496a..2df9b2e 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3755,7 +3755,7 @@ WmFrameCmd( if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); } - sprintf(buf, "0x%x", PTR2UINT(hwnd)); + sprintf(buf, "0x%x", PTR2INT(hwnd)); Tcl_SetResult(interp, buf, TCL_VOLATILE); return TCL_OK; } -- cgit v0.12