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.

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 */

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;