Cast tile, stipple and clip_mask pointers to gintptr when calculating

2008-08-05  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to
	gintptr when calculating hash, so we get all of the pointer bits
	on Win64 where long is 32 bits.


svn path=/trunk/; revision=21002
This commit is contained in:
Tor Lillqvist 2008-08-04 23:51:16 +00:00 committed by Tor Lillqvist
parent 9be8382038
commit ffeb954aff
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2008-08-05 Tor Lillqvist <tml@novell.com>
* gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to
gintptr when calculating hash, so we get all of the pointer bits
on Win64 where long is 32 bits.
2008-08-05 Tor Lillqvist <tml@novell.com>
* gtk/gtkprintoperation-win32.c: Don't need to declare

View File

@ -222,15 +222,15 @@ gtk_gc_key_hash (gpointer key)
}
if (keyval->mask & GDK_GC_TILE)
{
hash_val += (glong) keyval->values.tile;
hash_val += (gintptr) keyval->values.tile;
}
if (keyval->mask & GDK_GC_STIPPLE)
{
hash_val += (glong) keyval->values.stipple;
hash_val += (gintptr) keyval->values.stipple;
}
if (keyval->mask & GDK_GC_CLIP_MASK)
{
hash_val += (glong) keyval->values.clip_mask;
hash_val += (gintptr) keyval->values.clip_mask;
}
if (keyval->mask & GDK_GC_SUBWINDOW)
{