diff --git a/dix/gc.c b/dix/gc.c
index 39b56eeb22..a70e65e782 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -175,8 +175,8 @@ ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
             break;
         case GCLineStyle:
         {
-            unsigned int newlinestyle;
-            NEXTVAL(unsigned int, newlinestyle);
+            unsigned newlinestyle;
+            NEXTVAL(unsigned char, newlinestyle);
 
             if (newlinestyle <= LineDoubleDash)
                 pGC->lineStyle = newlinestyle;
@@ -189,8 +189,8 @@ ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
         }
         case GCCapStyle:
         {
-            unsigned int newcapstyle;
-            NEXTVAL(unsigned int, newcapstyle);
+            unsigned char newcapstyle;
+            NEXTVAL(unsigned char, newcapstyle);
 
             if (newcapstyle <= CapProjecting)
                 pGC->capStyle = newcapstyle;
@@ -203,8 +203,8 @@ ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
         }
         case GCJoinStyle:
         {
-            unsigned int newjoinstyle;
-            NEXTVAL(unsigned int, newjoinstyle);
+            unsigned char newjoinstyle;
+            NEXTVAL(unsigned char, newjoinstyle);
 
             if (newjoinstyle <= JoinBevel)
                 pGC->joinStyle = newjoinstyle;
@@ -217,8 +217,8 @@ ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
         }
         case GCFillStyle:
         {
-            unsigned int newfillstyle;
-            NEXTVAL(unsigned int, newfillstyle);
+            unsigned char newfillstyle;
+            NEXTVAL(unsigned char, newfillstyle);
 
             if (newfillstyle <= FillOpaqueStippled)
                 pGC->fillStyle = newfillstyle;
@@ -231,8 +231,8 @@ ChangeGC(ClientPtr client, GCPtr pGC, BITS32 mask, ChangeGCValPtr pUnion)
         }
         case GCFillRule:
         {
-            unsigned int newfillrule;
-            NEXTVAL(unsigned int, newfillrule);
+            unsigned char newfillrule;
+            NEXTVAL(unsigned char, newfillrule);
 
             if (newfillrule <= WindingRule)
                 pGC->fillRule = newfillrule;