[PATCH 05/13] dix: Re-type and repack the head of ScreenRec

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 include/scrnintstr.h |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 813bda1..3df3566 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -412,17 +412,16 @@ typedef    void (* DeviceCursorCleanupProcPtr)(
 
 typedef struct _Screen {
     int			myNum;	/* index of this instance in Screens[] */
-    ATOM		id;
     short		x, y, width, height;
     short		mmWidth, mmHeight;
-    short		numDepths;
+    unsigned char	numDepths;
     unsigned char      	rootDepth;
-    DepthPtr       	allowedDepths;
-    unsigned long      	rootVisual;
-    unsigned long	defColormap;
     short		minInstalledCmaps, maxInstalledCmaps;
     char                backingStoreSupport, saveUnderSupport;
-    unsigned long	whitePixel, blackPixel;
+    DepthPtr       	allowedDepths;
+    unsigned int      	rootVisual;
+    unsigned int	defColormap;
+    unsigned int	whitePixel, blackPixel;
     GCPtr		GCperDepth[MAXFORMATS+1];
 			/* next field is a stipple to use as default in
 			   a GC.  we don't build default tiles of all depths
-- 
1.7.3.1