summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2006-03-30 18:48:11 +0000
committerEgbert Eich <eich@suse.de>2006-03-30 18:48:11 +0000
commit9da1d2257d02155cc8b4541cf5fcb4e64d756945 (patch)
treee7698c668d752e51d4b6534245290390c293b138 /include
parent6d7ad353bafe914f0b50887daaeaae89ada6ebd3 (diff)
Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to resolve some of the careless mixtures of ulong and uint (which are different size on 64bit). Bugzilla #6438.
Diffstat (limited to 'include')
-rw-r--r--include/colormapst.h2
-rw-r--r--include/pixmapstr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/colormapst.h b/include/colormapst.h
index 5ceee9870..d2422ea85 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -97,7 +97,7 @@ typedef struct _ColormapRec
{
VisualPtr pVisual;
short class; /* PseudoColor or DirectColor */
- long mid; /* client's name for colormap */
+ XID mid; /* client's name for colormap */
ScreenPtr pScreen; /* screen map is associated with */
short flags; /* 1 = IsDefault
* 2 = AllAllocated */
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 22a1f1025..272ce6869 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -58,7 +58,7 @@ typedef struct _Drawable {
unsigned char class; /* specific to type */
unsigned char depth;
unsigned char bitsPerPixel;
- unsigned long id; /* resource id */
+ XID id; /* resource id */
short x; /* window: screen absolute, pixmap: 0 */
short y; /* window: screen absolute, pixmap: 0 */
unsigned short width;