summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-26 09:07:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-26 09:07:24 (GMT)
commit091178b345c21c048afcb7883ad35a1f86134a8d (patch)
treecf1e0f5a2d67dfbacb0d1335217d9c5c826f7a0c /generic
parent529dffb0f6edc48251edc30e74c00457372aa52b (diff)
parent5b0ab3da0e490d51ca930773cc40292bdc101a00 (diff)
downloadtk-091178b345c21c048afcb7883ad35a1f86134a8d.zip
tk-091178b345c21c048afcb7883ad35a1f86134a8d.tar.gz
tk-091178b345c21c048afcb7883ad35a1f86134a8d.tar.bz2
Merge 8.6
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCursor.c2
-rw-r--r--generic/tkStubInit.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index 76bbc89..6bdfa9d 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.c
@@ -425,7 +425,7 @@ Tk_NameOfCursor(
if (!dispPtr->cursorInit) {
printid:
- sprintf(dispPtr->cursorString, "cursor id %p", cursor);
+ sprintf(dispPtr->cursorString, "cursor id 0x%" TCL_Z_MODIFIER "x", (size_t)cursor);
return dispPtr->cursorString;
}
idHashPtr = Tcl_FindHashEntry(&dispPtr->cursorIdTable, cursor);
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 445cec5..26de8d9 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -143,7 +143,7 @@ TkpPrintWindowId(
* the hex representation of a pointer. */
Window window) /* Window to be printed into buffer. */
{
- sprintf(buf, "%#08lx", (unsigned long) (window));
+ sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)window);
}
int