Mercurial > mplayer.hg

changeset 33925:162828e38481

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace data type CARD32 by long. On the client side, properties of format 32 will be stored as long, even if it has more than 32 bits on the platform. This reverts r33610.
author ib
date Fri, 26 Aug 2011 09:46:42 +0000
parents f00fc114eb87
children 6e3f257d7b05
files gui/ui/widgets.h gui/wm/ws.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/widgets.h	Thu Aug 25 19:19:53 2011 +0000
+++ b/gui/ui/widgets.h	Fri Aug 26 09:46:42 2011 +0000
@@ -59,7 +59,7 @@
     Pixmap normal;
     Pixmap normal_mask;
     int collection_size;
-    CARD32 *collection;
+    long *collection;
 } guiIcon_t;
 
 extern guiIcon_t guiIcon;
--- a/gui/wm/ws.c	Thu Aug 25 19:19:53 2011 +0000
+++ b/gui/wm/ws.c	Fri Aug 26 09:46:42 2011 +0000
@@ -1536,7 +1536,7 @@
 {
     XWMHints *wm;
     Atom iconatom;
-    CARD32 data[2];
+    long data[2];
 
     if (icon->normal) {
         wm = XGetWMHints(dsp, win);