diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-04 23:51:16 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-04 23:51:16 +0000 |
| commit | ffeb954aff59905b1f8956b9a73a2e968711a573 (patch) | |
| tree | e73dcb753f5ed6a8ba827761759d052518c34031 | |
| parent | 9be838203829f858e8ca84fe299a1608b77a5c7b (diff) | |
| download | gtk+-ffeb954aff59905b1f8956b9a73a2e968711a573.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtkgc.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 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 IPrintDialogCallback with mingw64 either. It seems to come with newer versions of the headers. diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c index 8e6bc9f8d5..15d863621f 100644 --- a/gtk/gtkgc.c +++ b/gtk/gtkgc.c @@ -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) { |