diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 297d6723d0..0656d3544e 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -1138,7 +1138,7 @@ XineramaGetImageData(DrawablePtr *pDrawables,
 {
     RegionRec SrcRegion, GrabRegion;
     BoxRec SrcBox;
-    int size, sizeNeeded, ScratchPitch, depth;
+    int size, sizeNeeded, depth;
     DrawablePtr pDraw = pDrawables[0];
     char *ScratchMem = NULL;
 
@@ -1197,7 +1197,7 @@ XineramaGetImageData(DrawablePtr *pDrawables,
             while (nbox--) {
                 int w = pbox->x2 - pbox->x1;
                 int h = pbox->y2 - pbox->y1;
-                ScratchPitch = PixmapBytePad(w, depth);
+                int ScratchPitch = PixmapBytePad(w, depth);
                 sizeNeeded = ScratchPitch * h;
 
                 if (sizeNeeded > size) {