summaryrefslogtreecommitdiffstats
path: root/generic/tkAtom.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-16 13:03:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-16 13:03:43 (GMT)
commit3876ba4df3e26ded567937787afa2068b9815626 (patch)
treec4452046a4a872fb20c9437f5719b664baca41d7 /generic/tkAtom.c
parentaf28c015d3494e872c4094934f33251157662310 (diff)
parent664a327665c85de251423f7a679879e8382041c8 (diff)
downloadtk-3876ba4df3e26ded567937787afa2068b9815626.zip
tk-3876ba4df3e26ded567937787afa2068b9815626.tar.gz
tk-3876ba4df3e26ded567937787afa2068b9815626.tar.bz2
[Bug 3388350] mingw64 compiler warnings
Diffstat (limited to 'generic/tkAtom.c')
-rw-r--r--generic/tkAtom.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkAtom.c b/generic/tkAtom.c
index 85d3748..54d3598 100644
--- a/generic/tkAtom.c
+++ b/generic/tkAtom.c
@@ -93,11 +93,11 @@ Tk_InternAtom(
Atom atom;
atom = XInternAtom(dispPtr->display, name, False);
- Tcl_SetHashValue(hPtr, atom);
- hPtr2 = Tcl_CreateHashEntry(&dispPtr->atomTable, (char*) atom, &isNew);
+ Tcl_SetHashValue(hPtr, INT2PTR(atom));
+ hPtr2 = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew);
Tcl_SetHashValue(hPtr2, Tcl_GetHashKey(&dispPtr->nameTable, hPtr));
}
- return (Atom) Tcl_GetHashValue(hPtr);
+ return (Atom) PTR2INT(Tcl_GetHashValue(hPtr));
}
/*
@@ -135,7 +135,7 @@ Tk_GetAtomName(
AtomInit(dispPtr);
}
- hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, (char *) atom);
+ hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, INT2PTR(atom));
if (hPtr == NULL) {
char *name;
Tk_ErrorHandler handler;
@@ -151,12 +151,12 @@ Tk_GetAtomName(
}
Tk_DeleteErrorHandler(handler);
hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew);
- Tcl_SetHashValue(hPtr, atom);
+ Tcl_SetHashValue(hPtr, INT2PTR(atom));
if (mustFree) {
XFree(name);
}
name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr);
- hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, (char *) atom, &isNew);
+ hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew);
Tcl_SetHashValue(hPtr, name);
}
return Tcl_GetHashValue(hPtr);
@@ -193,16 +193,16 @@ AtomInit(
char *name;
int isNew;
- hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, (char *) atom);
+ hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, INT2PTR(atom));
if (hPtr != NULL) {
continue;
}
name = atomNameArray[atom - 1];
hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew);
- Tcl_SetHashValue(hPtr, atom);
+ Tcl_SetHashValue(hPtr, INT2PTR(atom));
name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr);
- hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, (char *) atom, &isNew);
+ hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew);
Tcl_SetHashValue(hPtr, name);
}
}