[PATCH 23/23] dix: Retype and repack GC

[Adam Jackson]

LP64: 160 bytes before, 128 after.

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

diff --git a/include/gcstruct.h b/include/gcstruct.h
index 32e89a1..aa2064c 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -260,9 +260,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:15;     /* 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
@@ -270,11 +270,11 @@ typedef struct _GC {
     PixUnion tile;
     PixmapPtr stipple;
     DDXPointRec patOrg;         /* origin for (tile, stipple) */
-    struct _Font *font;
     DDXPointRec clipOrg;
+    struct _Font *font;
     RegionPtr clientClip;
-    unsigned long stateChanges; /* masked with GC_<kind> */
-    unsigned long serialNumber;
+    unsigned int stateChanges; /* masked with GC_<kind> */
+    unsigned int serialNumber;
     const GCFuncs *funcs;
     const GCOps *ops;
     PrivateRec *devPrivates;
-- 
1.9.3