[PATCH 01/13] dix: Re-type and reorder GCRec

[Adam Jackson]

No change on ILP32, but shrinks from 160 to 128 bytes on LP64.

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

diff --git a/include/gcstruct.h b/include/gcstruct.h
index 4fea02c..767adac 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -291,9 +291,9 @@ typedef struct _GC {
     unsigned int	freeCompClip:1;  /* Free composite clip */
     unsigned int	scratch_inuse:1; /* is this GC in a pool for reuse? */
     unsigned int	unused:13; /* see comment above */
-    unsigned long	planemask;
-    unsigned long	fgPixel;
-    unsigned long	bgPixel;
+    unsigned int	planemask;
+    unsigned int	fgPixel;
+    unsigned int	bgPixel;
     /*
      * alas -- both tile and stipple must be here as they
      * are independently specifiable
@@ -301,11 +301,11 @@ typedef struct _GC {
     PixUnion		tile;
     PixmapPtr		stipple;
     DDXPointRec		patOrg;		/* origin for (tile, stipple) */
-    struct _Font	*font;
     DDXPointRec		clipOrg;
+    struct _Font	*font;
     pointer		clientClip;
-    unsigned long	stateChanges;	/* masked with GC_<kind> */
-    unsigned long       serialNumber;
+    unsigned int	stateChanges;	/* masked with GC_<kind> */
+    unsigned int	serialNumber;
     GCFuncs		*funcs;
     GCOps		*ops;
     PrivateRec		*devPrivates;
-- 
1.7.3.1