summaryrefslogtreecommitdiff
path: root/openbox/prop.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2005-10-07 17:00:35 +0000
committerMikael Magnusson <mikachu@comhem.se>2005-10-07 17:00:35 +0000
commit1fad2da07f7fed1d640d57a2c7c2f666ebb409c4 (patch)
tree2040eb9fbafe2e8fa9f9a7631b5d8e0ee55481d0 /openbox/prop.c
parent148ef741e11b89365cff0538ab3b0abff69e118d (diff)
more 64 bit fixes
Diffstat (limited to 'openbox/prop.c')
-rw-r--r--openbox/prop.c8
1 files changed, 4 insertions, 4 deletions
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,