From 1fad2da07f7fed1d640d57a2c7c2f666ebb409c4 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 7 Oct 2005 17:00:35 +0000 Subject: more 64 bit fixes --- openbox/prop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openbox/prop.c') diff --git a/openbox/prop.c b/openbox/prop.c index f6559c40..fe21bc44 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -206,7 +206,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size, data[i] = xdata[i]; break; case 16: - ((guint16*)data)[i] = ((guint16*)xdata)[i]; + ((gushort*)data)[i] = ((gushort*)xdata)[i]; break; case 32: ((guint32*)data)[i] = ((gulong*)xdata)[i]; @@ -245,7 +245,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size, (*data)[i] = xdata[i]; break; case 16: - ((guint16*)*data)[i] = ((guint16*)xdata)[i]; + ((gushort*)*data)[i] = ((gushort*)xdata)[i]; break; case 32: ((guint32*)*data)[i] = ((gulong*)xdata)[i]; @@ -383,13 +383,13 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) return FALSE; } -void prop_set32(Window win, Atom prop, Atom type, guint32 val) +void prop_set32(Window win, Atom prop, Atom type, gulong val) { XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, (guchar*)&val, 1); } -void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, +void prop_set_array32(Window win, Atom prop, Atom type, gulong *val, guint num) { XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, -- cgit v1.2.3