[MPlayer-cvslog] r34013 - in trunk/gui: ui/widgets.h wm/ws.c

[ib]

Author: ib
Date: Fri Aug 26 11:46:42 2011
New Revision: 34013

Log:
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.

Modified:
   trunk/gui/ui/widgets.h
   trunk/gui/wm/ws.c

Modified: trunk/gui/ui/widgets.h
==============================================================================
--- trunk/gui/ui/widgets.h	Thu Aug 25 21:19:53 2011	(r34012)
+++ trunk/gui/ui/widgets.h	Fri Aug 26 11:46:42 2011	(r34013)
@@ -59,7 +59,7 @@ typedef struct {
     Pixmap normal;
     Pixmap normal_mask;
     int collection_size;
-    CARD32 *collection;
+    long *collection;
 } guiIcon_t;
 
 extern guiIcon_t guiIcon;

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Aug 25 21:19:53 2011	(r34012)
+++ trunk/gui/wm/ws.c	Fri Aug 26 11:46:42 2011	(r34013)
@@ -1536,7 +1536,7 @@ void wsSetIcon(Display *dsp, Window win,
 {
     XWMHints *wm;
     Atom iconatom;
-    CARD32 data[2];
+    long data[2];
 
     if (icon->normal) {
         wm = XGetWMHints(dsp, win);