Switch to 64-bit ints

18 files changed, 260 insertions, 269 deletions

diff --git a/do_arcs.c b/do_arcs.c
index 5c5f1ba..5afd434 100644
--- a/do_arcs.c
+++ b/do_arcs.c
@@ -90,14 +90,14 @@ GenerateCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
 }
 
 int 
-InitCircles(XParms xp, Parms p, int reps)
+InitCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, False, False);
     return reps;
 }
 
 int 
-InitPartCircles(XParms xp, Parms p, int reps)
+InitPartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
     return reps;
@@ -105,7 +105,7 @@ InitPartCircles(XParms xp, Parms p, int reps)
 
 
 int 
-InitChordPartCircles(XParms xp, Parms p, int reps)
+InitChordPartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
     XSetArcMode(xp->d, xp->bggc, ArcChord);
@@ -115,7 +115,7 @@ InitChordPartCircles(XParms xp, Parms p, int reps)
 
 
 int 
-InitSlicePartCircles(XParms xp, Parms p, int reps)
+InitSlicePartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
     XSetArcMode(xp->d, xp->bggc, ArcPieSlice);
@@ -146,21 +146,21 @@ GenerateWideCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
 }
 
 int 
-InitWideCircles(XParms xp, Parms p, int reps)
+InitWideCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideCircles (xp, p, False, False);
     return reps;
 }
  
 int 
-InitPartWideCircles(XParms xp, Parms p, int reps)
+InitPartWideCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideCircles (xp, p, True, False);
     return reps;
 }
  
 int 
-InitDashedCircles(XParms xp, Parms p, int reps)
+InitDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -176,7 +176,7 @@ InitDashedCircles(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDashedCircles(XParms xp, Parms p, int reps)
+InitWideDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -197,7 +197,7 @@ InitWideDashedCircles(XParms xp, Parms p, int reps)
 }
 
 int 
-InitDoubleDashedCircles(XParms xp, Parms p, int reps)
+InitDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -213,7 +213,7 @@ InitDoubleDashedCircles(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDoubleDashedCircles(XParms xp, Parms p, int reps)
+InitWideDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -306,7 +306,7 @@ GenerateEllipses(XParms xp, Parms p, int partialArcs, Bool ddashed)
 }
 
 int 
-InitEllipses(XParms xp, Parms p, int reps)
+InitEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, False, False);
     return reps;
@@ -314,7 +314,7 @@ InitEllipses(XParms xp, Parms p, int reps)
 
 
 int 
-InitPartEllipses(XParms xp, Parms p, int reps)
+InitPartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
     return reps;
@@ -322,7 +322,7 @@ InitPartEllipses(XParms xp, Parms p, int reps)
 
 
 int 
-InitChordPartEllipses(XParms xp, Parms p, int reps)
+InitChordPartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
     XSetArcMode(xp->d, xp->bggc, ArcChord);
@@ -332,7 +332,7 @@ InitChordPartEllipses(XParms xp, Parms p, int reps)
 
 
 int 
-InitSlicePartEllipses(XParms xp, Parms p, int reps)
+InitSlicePartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
     XSetArcMode(xp->d, xp->bggc, ArcPieSlice);
@@ -364,21 +364,21 @@ GenerateWideEllipses(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
 }
 
 int 
-InitWideEllipses(XParms xp, Parms p, int reps)
+InitWideEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideEllipses(xp, p, False, False);
     return reps;
 }
  
 int 
-InitPartWideEllipses(XParms xp, Parms p, int reps)
+InitPartWideEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideEllipses(xp, p, True, False);
     return reps;
 }
  
 int 
-InitDashedEllipses(XParms xp, Parms p, int reps)
+InitDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -394,7 +394,7 @@ InitDashedEllipses(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDashedEllipses(XParms xp, Parms p, int reps)
+InitWideDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -415,7 +415,7 @@ InitWideDashedEllipses(XParms xp, Parms p, int reps)
 }
 
 int 
-InitDoubleDashedEllipses(XParms xp, Parms p, int reps)
+InitDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -431,7 +431,7 @@ InitDoubleDashedEllipses(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDoubleDashedEllipses(XParms xp, Parms p, int reps)
+InitWideDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -452,7 +452,7 @@ InitWideDoubleDashedEllipses(XParms xp, Parms p, int reps)
 }
 
 void 
-DoArcs(XParms xp, Parms p, int reps)
+DoArcs(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -471,7 +471,7 @@ DoArcs(XParms xp, Parms p, int reps)
 }
 
 void 
-DoFilledArcs(XParms xp, Parms p, int reps)
+DoFilledArcs(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
diff --git a/do_blt.c b/do_blt.c
index 879c0e5..3374ca6 100644
--- a/do_blt.c
+++ b/do_blt.c
@@ -63,7 +63,7 @@ InitBltLines(void)
 }
 
 int 
-InitScroll(XParms xp, Parms p, int reps)
+InitScroll(XParms xp, Parms p, int64_t reps)
 {
     InitBltLines();
     XDrawLines(xp->d, xp->w, xp->fggc, points, NUMPOINTS, CoordModeOrigin);
@@ -71,7 +71,7 @@ InitScroll(XParms xp, Parms p, int reps)
 }
 
 void 
-DoScroll(XParms xp, Parms p, int reps)
+DoScroll(XParms xp, Parms p, int64_t reps)
 {
     int i, size, x, y, xorg, yorg, delta;
 
@@ -125,7 +125,7 @@ EndScroll(XParms xp, Parms p)
 
 static void 
 InitCopyLocations(int size, int mul, int div, 
-		  int reps, XSegment **ap, XSegment **bp)
+		  int64_t reps, XSegment **ap, XSegment **bp)
 {
     int x1, y1, x2, y2, i;
     int xinc, yinc;
@@ -186,7 +186,7 @@ InitCopyLocations(int size, int mul, int div,
 
 
 int 
-InitCopyWin(XParms xp, Parms p, int reps)
+InitCopyWin(XParms xp, Parms p, int64_t reps)
 {
     (void) InitScroll(xp, p, reps);
     InitCopyLocations(p->special, 1, 1, reps, &segsa, &segsb);
@@ -194,7 +194,7 @@ InitCopyWin(XParms xp, Parms p, int reps)
 }
 
 int 
-InitCopyPix(XParms xp, Parms p, int reps)
+InitCopyPix(XParms xp, Parms p, int64_t reps)
 {
     GC		pixgc;
     (void) InitCopyWin(xp, p, reps);
@@ -209,7 +209,7 @@ InitCopyPix(XParms xp, Parms p, int reps)
 }
 
 int 
-InitGetImage(XParms xp, Parms p, int reps)
+InitGetImage(XParms xp, Parms p, int64_t reps)
 {
     (void) InitCopyWin(xp, p, reps);
 
@@ -224,7 +224,7 @@ InitGetImage(XParms xp, Parms p, int reps)
 }
 
 int 
-InitPutImage(XParms xp, Parms p, int reps)
+InitPutImage(XParms xp, Parms p, int64_t reps)
 {
     if(!InitGetImage(xp, p, reps))return False;
     XClearWindow(xp->d, xp->w);
@@ -232,7 +232,7 @@ InitPutImage(XParms xp, Parms p, int reps)
 }
 
 static void 
-CopyArea(XParms xp, Parms p, int reps, Drawable src, Drawable dst)
+CopyArea(XParms xp, Parms p, int64_t reps, Drawable src, Drawable dst)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -252,33 +252,33 @@ CopyArea(XParms xp, Parms p, int reps, Drawable src, Drawable dst)
 }
 
 void 
-DoCopyWinWin(XParms xp, Parms p, int reps)
+DoCopyWinWin(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, xp->w, xp->w);
 }
 
 void 
-DoCopyPixWin(XParms xp, Parms p, int reps)
+DoCopyPixWin(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, pix, xp->w);
 }
 
 void 
-DoCopyWinPix(XParms xp, Parms p, int reps)
+DoCopyWinPix(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, xp->w, pix);
     xp->p = pix;	/* HardwareSync will now sync on pixmap */
 }
 
 void 
-DoCopyPixPix(XParms xp, Parms p, int reps)
+DoCopyPixPix(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, pix, pix);
     xp->p = pix;	/* HardwareSync will now sync on pixmap */
 }
 
 void 
-DoGetImage(XParms xp, Parms p, int reps)
+DoGetImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -319,7 +319,7 @@ rectangle.
 }
 
 void 
-DoPutImage(XParms xp, Parms p, int reps)
+DoPutImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -368,7 +368,7 @@ shmerrorhandler(Display *d, XErrorEvent *e)
 }
 
 static int
-InitShmImage(XParms xp, Parms p, int reps, Bool read_only)
+InitShmImage(XParms xp, Parms p, int64_t reps, Bool read_only)
 {
     int	image_size;
 
@@ -450,7 +450,7 @@ InitShmImage(XParms xp, Parms p, int reps, Bool read_only)
 }
 
 int
-InitShmPutImage(XParms xp, Parms p, int reps)
+InitShmPutImage(XParms xp, Parms p, int64_t reps)
 {
     if (!InitShmImage(xp, p, reps, True)) return False;
     XClearWindow(xp->d, xp->w);
@@ -458,13 +458,13 @@ InitShmPutImage(XParms xp, Parms p, int reps)
 }
 
 int
-InitShmGetImage(XParms xp, Parms p, int reps)
+InitShmGetImage(XParms xp, Parms p, int64_t reps)
 {
     return InitShmImage(xp, p, reps, False);
 }
 
-void
-DoShmPutImage(XParms xp, Parms p, int reps)
+void 
+DoShmPutImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -484,7 +484,7 @@ DoShmPutImage(XParms xp, Parms p, int reps)
 }
 
 void
-DoShmGetImage(XParms xp, Parms p, int reps)
+DoShmGetImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -568,7 +568,7 @@ EndGetImage(XParms xp, Parms p)
 }
 
 int
-InitCopyPlane(XParms xp, Parms p, int reps)
+InitCopyPlane(XParms xp, Parms p, int64_t reps)
 {
     XGCValues   gcv;
     GC		pixgc;
@@ -595,7 +595,7 @@ InitCopyPlane(XParms xp, Parms p, int reps)
 }
 
 void 
-DoCopyPlane(XParms xp, Parms p, int reps)
+DoCopyPlane(XParms xp, Parms p, int64_t reps)
 {
     int		i, size;
     XSegment    *sa, *sb;
@@ -619,7 +619,7 @@ DoCopyPlane(XParms xp, Parms p, int reps)
 static Picture	winPict, pixPict;
 
 int
-InitCompositeWin(XParms xp, Parms p, int reps)
+InitCompositeWin(XParms xp, Parms p, int64_t reps)
 {
     XRenderPictFormat	*format;
 
@@ -636,10 +636,11 @@ InitCompositeWin(XParms xp, Parms p, int reps)
 }
 
 int
-InitCompositePix(XParms xp, Parms p, int reps)
+InitCompositePix(XParms xp, Parms p, int64_t reps)
 {
     XRenderPictFormat	*format = NULL;
     int			depth;
+    static XRenderColor c = { 0xffff, 0x0000, 0xffff, 0xffff };
 
     (void) InitCompositeWin (xp, p, reps);
     
@@ -678,7 +679,6 @@ InitCompositePix(XParms xp, Parms p, int reps)
 		      winPict, None, pixPict,
 		      0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);
     
-    static XRenderColor c = { 0xffff, 0x0000, 0xffff, 0xffff };
     XRenderFillRectangle (xp->d, PictOpSrc,
 			  pixPict, &c, 0, 0, WIDTH, HEIGHT);
 #if 1
@@ -714,7 +714,7 @@ EndCompositeWin (XParms xp, Parms p)
 }
 
 static void 
-CompositeArea(XParms xp, Parms p, int reps, Picture src, Picture dst)
+CompositeArea(XParms xp, Parms p, int64_t reps, Picture src, Picture dst)
 {
     int i, size;
     XSegment *sa, *sb;
@@ -746,13 +746,13 @@ CompositeArea(XParms xp, Parms p, int reps, Picture src, Picture dst)
 }
 
 void
-DoCompositeWinWin (XParms xp, Parms p, int reps)
+DoCompositeWinWin (XParms xp, Parms p, int64_t reps)
 {
     CompositeArea (xp, p, reps, winPict, winPict);
 }
 
 void
-DoCompositePixWin (XParms xp, Parms p, int reps)
+DoCompositePixWin (XParms xp, Parms p, int64_t reps)
 {
     CompositeArea (xp, p, reps, pixPict, winPict);
 }
diff --git a/do_complex.c b/do_complex.c
index 3eac738..88f1d4f 100644
--- a/do_complex.c
+++ b/do_complex.c
@@ -36,7 +36,7 @@ static GC       pgc;
 #endif /* QNX4 */
 
 int 
-InitComplexPoly(XParms xp, Parms p, int reps)
+InitComplexPoly(XParms xp, Parms p, int64_t reps)
 {
     int     i, j, numPoints;
     int     x, y;
@@ -96,7 +96,7 @@ InitComplexPoly(XParms xp, Parms p, int reps)
 }
 
 void 
-DoComplexPoly(XParms xp, Parms p, int reps)
+DoComplexPoly(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
     XPoint  *curPoint;
@@ -123,7 +123,7 @@ EndComplexPoly(XParms xp, Parms p)
 }
 
 int 
-InitGeneralPoly(XParms xp, Parms p, int reps)
+InitGeneralPoly(XParms xp, Parms p, int64_t reps)
 {
     int     i, j, numPoints;
     int	    nsides;
@@ -169,7 +169,7 @@ InitGeneralPoly(XParms xp, Parms p, int reps)
 }
 
 void 
-DoGeneralPoly(XParms xp, Parms p, int reps)
+DoGeneralPoly(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
     int	    nsides;
diff --git a/do_dots.c b/do_dots.c
index 8279437..fe9ca2e 100644
--- a/do_dots.c
+++ b/do_dots.c
@@ -27,7 +27,7 @@ static XPoint   *points;
 static GC       pgc;
 
 int 
-InitDots(XParms xp, Parms p, int reps)
+InitDots(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -43,7 +43,7 @@ InitDots(XParms xp, Parms p, int reps)
 }
 
 void 
-DoDots(XParms xp, Parms p, int reps)
+DoDots(XParms xp, Parms p, int64_t reps)
 {
     int     i;
 
diff --git a/do_lines.c b/do_lines.c
index 88a1ebd..d2ad1d6 100644
--- a/do_lines.c
+++ b/do_lines.c
@@ -162,14 +162,14 @@ GenerateLines(XParms xp, Parms p, Bool ddashed)
 }
  
 int 
-InitLines(XParms xp, Parms p, int reps)
+InitLines(XParms xp, Parms p, int64_t reps)
 {
     GenerateLines(xp, p, False);
 	return reps;
 }
 
 static int 
-GenerateWideLines(XParms xp, Parms p, int reps, Bool ddashed)
+GenerateWideLines(XParms xp, Parms p, int64_t reps, Bool ddashed)
 {
     int size;
 
@@ -193,13 +193,13 @@ GenerateWideLines(XParms xp, Parms p, int reps, Bool ddashed)
 }
 
 int 
-InitWideLines(XParms xp, Parms p, int reps)
+InitWideLines(XParms xp, Parms p, int64_t reps)
 {
     return GenerateWideLines(xp, p, reps, False);
 }
  
 int 
-InitDashedLines(XParms xp, Parms p, int reps)
+InitDashedLines(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -215,7 +215,7 @@ InitDashedLines(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDashedLines(XParms xp, Parms p, int reps)
+InitWideDashedLines(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -236,7 +236,7 @@ InitWideDashedLines(XParms xp, Parms p, int reps)
 }
 
 int 
-InitDoubleDashedLines(XParms xp, Parms p, int reps)
+InitDoubleDashedLines(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -252,7 +252,7 @@ InitDoubleDashedLines(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideDoubleDashedLines(XParms xp, Parms p, int reps)
+InitWideDoubleDashedLines(XParms xp, Parms p, int64_t reps)
 {
     int		size;
     XGCValues   gcv;
@@ -273,7 +273,7 @@ InitWideDoubleDashedLines(XParms xp, Parms p, int reps)
 }
 
 void 
-DoLines(XParms xp, Parms p, int reps)
+DoLines(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
diff --git a/do_movewin.c b/do_movewin.c
index ed96ae1..27b0389 100644
--- a/do_movewin.c
+++ b/do_movewin.c
@@ -34,7 +34,7 @@ static int delta1;		/* Private global data for DoResizeWindows */
 #define STACK (4*(HEIGHT-10)/CHILDSIZE)
 
 int 
-InitMoveWindows(XParms xp, Parms p, int reps)
+InitMoveWindows(XParms xp, Parms p, int64_t reps)
 {
     int     i = 0;
 
@@ -63,7 +63,7 @@ InitMoveWindows(XParms xp, Parms p, int reps)
 }
 
 void 
-DoMoveWindows(XParms xp, Parms p, int reps)
+DoMoveWindows(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
 
@@ -90,7 +90,7 @@ EndMoveWindows(XParms xp, Parms p)
 }
 
 void 
-DoResizeWindows(XParms xp, Parms p, int reps)
+DoResizeWindows(XParms xp, Parms p, int64_t reps)
 {
     int     i, j, delta2;
 
@@ -107,7 +107,7 @@ DoResizeWindows(XParms xp, Parms p, int reps)
 }
 
 int
-InitCircWindows(XParms xp, Parms p, int reps)
+InitCircWindows(XParms xp, Parms p, int64_t reps)
 {
     int     i;
     int     pos;
@@ -127,7 +127,7 @@ InitCircWindows(XParms xp, Parms p, int reps)
 }
 
 void 
-DoCircWindows(XParms xp, Parms p, int reps)
+DoCircWindows(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
 
@@ -147,7 +147,7 @@ EndCircWindows(XParms xp, Parms p)
 
 
 int 
-InitMoveTree(XParms xp, Parms p, int reps)
+InitMoveTree(XParms xp, Parms p, int64_t reps)
 {
     int     i = 0;
 
@@ -180,7 +180,7 @@ InitMoveTree(XParms xp, Parms p, int reps)
 }
 
 void 
-DoMoveTree(XParms xp, Parms p, int reps)
+DoMoveTree(XParms xp, Parms p, int64_t reps)
 {
     int     i;
 
diff --git a/do_rects.c b/do_rects.c
index f697cdb..b4507bc 100644
--- a/do_rects.c
+++ b/do_rects.c
@@ -28,7 +28,7 @@ static XRectangle   *rects;
 static GC	    pgc;
 
 int 
-InitRectangles(XParms xp, Parms p, int reps)
+InitRectangles(XParms xp, Parms p, int64_t reps)
 {
     int i;
     int size = p->special;
@@ -84,7 +84,7 @@ InitRectangles(XParms xp, Parms p, int reps)
 }
 
 void 
-DoRectangles(XParms xp, Parms p, int reps)
+DoRectangles(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -99,7 +99,7 @@ DoRectangles(XParms xp, Parms p, int reps)
 }
 
 void 
-DoOutlineRectangles(XParms xp, Parms  p, int reps)
+DoOutlineRectangles(XParms xp, Parms  p, int64_t reps)
 {
     int	i;
 
diff --git a/do_segs.c b/do_segs.c
index bc13fbd..369f784 100644
--- a/do_segs.c
+++ b/do_segs.c
@@ -166,14 +166,14 @@ GenerateSegments(XParms xp, Parms p, Bool ddashed)
 }
    
 int 
-InitSegments(XParms xp, Parms p, int reps)
+InitSegments(XParms xp, Parms p, int64_t reps)
 {
     GenerateSegments(xp, p, False);
     return reps;
 }
 
 int 
-InitDashedSegments(XParms xp, Parms p, int reps)
+InitDashedSegments(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -191,7 +191,7 @@ InitDashedSegments(XParms xp, Parms p, int reps)
 }
 
 int 
-InitDoubleDashedSegments(XParms xp, Parms p, int reps)
+InitDoubleDashedSegments(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
 
@@ -209,7 +209,7 @@ InitDoubleDashedSegments(XParms xp, Parms p, int reps)
 }
 
 int 
-InitHorizSegments(XParms xp, Parms p, int reps)
+InitHorizSegments(XParms xp, Parms p, int64_t reps)
 {
     int     size;
     int     half;
@@ -265,7 +265,7 @@ InitHorizSegments(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideHorizSegments(XParms xp, Parms p, int reps)
+InitWideHorizSegments(XParms xp, Parms p, int64_t reps)
 {
     int size;
 
@@ -282,7 +282,7 @@ InitWideHorizSegments(XParms xp, Parms p, int reps)
  
 
 int 
-InitVertSegments(XParms xp, Parms p, int reps)
+InitVertSegments(XParms xp, Parms p, int64_t reps)
 {
     int     size;
     int     half;
@@ -340,7 +340,7 @@ InitVertSegments(XParms xp, Parms p, int reps)
 }
 
 int 
-InitWideVertSegments(XParms xp, Parms p, int reps)
+InitWideVertSegments(XParms xp, Parms p, int64_t reps)
 {
     int size;
 
@@ -357,7 +357,7 @@ InitWideVertSegments(XParms xp, Parms p, int reps)
  
 
 void 
-DoSegments(XParms xp, Parms p, int reps)
+DoSegments(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
diff --git a/do_simple.c b/do_simple.c
index 0904b6f..d6c4d59 100644
--- a/do_simple.c
+++ b/do_simple.c
@@ -32,7 +32,7 @@ SOFTWARE.
 static Atom XA_PK_TEMP;
 
 void 
-DoNoOp(XParms xp, Parms p, int reps)
+DoNoOp(XParms xp, Parms p, int64_t reps)
 {
     int     i;
 
@@ -44,7 +44,7 @@ DoNoOp(XParms xp, Parms p, int reps)
 
 
 void 
-DoGetAtom(XParms xp, Parms p, int reps)
+DoGetAtom(XParms xp, Parms p, int64_t reps)
 {
     char    *atom;
     int     i;
@@ -57,7 +57,7 @@ DoGetAtom(XParms xp, Parms p, int reps)
 }
 
 void 
-DoQueryPointer(XParms xp, Parms p, int reps)
+DoQueryPointer(XParms xp, Parms p, int64_t reps)
 {
     int     i;
     Window  w;
@@ -71,7 +71,7 @@ DoQueryPointer(XParms xp, Parms p, int reps)
 }
 
 int 
-InitGetProperty(XParms xp, Parms p, int reps)
+InitGetProperty(XParms xp, Parms p, int64_t reps)
 {
     long foo[4];
 
@@ -87,7 +87,7 @@ InitGetProperty(XParms xp, Parms p, int reps)
 }
 
 void 
-DoGetProperty(XParms xp, Parms p, int reps)
+DoGetProperty(XParms xp, Parms p, int64_t reps)
 {
     int     i;
     int     actual_format;
diff --git a/do_text.c b/do_text.c
index 6b41201..01845e1 100644
--- a/do_text.c
+++ b/do_text.c
@@ -35,7 +35,7 @@ static int charsPerLine, totalLines;
 
 
 int 
-InitText(XParms xp, Parms p, int reps)
+InitText(XParms xp, Parms p, int64_t reps)
 {
     int		i, j;
     char	ch;
@@ -119,7 +119,7 @@ InitText(XParms xp, Parms p, int reps)
 } /* GetRealChar */
 
 int 
-InitText16(XParms xp, Parms p, int reps)
+InitText16(XParms xp, Parms p, int64_t reps)
 {
     register int	i, j;
     register char	*pbuf0, *pbuf1, *pbuf2;
@@ -218,7 +218,7 @@ InitText16(XParms xp, Parms p, int reps)
 }
 
 void 
-DoText(XParms xp, Parms p, int reps)
+DoText(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -240,7 +240,7 @@ DoText(XParms xp, Parms p, int reps)
 }
 
 void 
-DoText16(XParms xp, Parms p, int reps)
+DoText16(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -262,7 +262,7 @@ DoText16(XParms xp, Parms p, int reps)
 }
 
 void 
-DoPolyText(XParms xp, Parms p, int reps)
+DoPolyText(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -284,7 +284,7 @@ DoPolyText(XParms xp, Parms p, int reps)
 }
 
 void 
-DoPolyText16(XParms xp, Parms p, int reps)
+DoPolyText16(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -306,7 +306,7 @@ DoPolyText16(XParms xp, Parms p, int reps)
 }
 
 void 
-DoImageText(XParms xp, Parms p, int reps)
+DoImageText(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -328,7 +328,7 @@ DoImageText(XParms xp, Parms p, int reps)
 }
 
 void 
-DoImageText16(XParms xp, Parms p, int reps)
+DoImageText16(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
@@ -405,7 +405,7 @@ static XftDraw	*aadraw;
 static XftColor	aacolor;
 
 int 
-InitAAText(XParms xp, Parms p, int reps)
+InitAAText(XParms xp, Parms p, int64_t reps)
 {
     int			i, j;
     char		ch;
@@ -471,7 +471,7 @@ InitAAText(XParms xp, Parms p, int reps)
 }
 
 void 
-DoAAText(XParms xp, Parms p, int reps)
+DoAAText(XParms xp, Parms p, int64_t reps)
 {
     int     i, line, startLine;
 
diff --git a/do_traps.c b/do_traps.c
index 05f43c2..1c33ab0 100644
--- a/do_traps.c
+++ b/do_traps.c
@@ -29,7 +29,7 @@ static XPoint *points;
 static GC      pgc;
 
 int 
-InitTrapezoids(XParms xp, Parms p, int reps)
+InitTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     int     i, numPoints;
     int     rows;
@@ -78,7 +78,7 @@ InitTrapezoids(XParms xp, Parms p, int reps)
 }
 
 void 
-DoTrapezoids(XParms xp, Parms p, int reps)
+DoTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
     XPoint  *curPoint;
@@ -118,7 +118,7 @@ static Pixmap		    maskPixmap;
 static Picture		    mask;
 
 int
-InitFixedTraps(XParms xp, Parms p, int reps)
+InitFixedTraps(XParms xp, Parms p, int64_t reps)
 {
     int     i, numTraps;
     int     rows;
@@ -230,7 +230,7 @@ InitFixedTraps(XParms xp, Parms p, int reps)
 }
 
 void 
-DoFixedTraps(XParms xp, Parms p, int reps)
+DoFixedTraps(XParms xp, Parms p, int64_t reps)
 {
     int		i;
     Picture	white, black, src, dst;
@@ -264,7 +264,7 @@ EndFixedTraps (XParms xp, Parms p)
 }
 
 int
-InitFixedTrapezoids(XParms xp, Parms p, int reps)
+InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     int     i, numTraps;
     int     rows;
@@ -364,7 +364,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int reps)
 }
 
 void 
-DoFixedTrapezoids(XParms xp, Parms p, int reps)
+DoFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     int		i;
     Picture	white, black, src, dst;
diff --git a/do_tris.c b/do_tris.c
index cf0200e..0a8d511 100644
--- a/do_tris.c
+++ b/do_tris.c
@@ -56,7 +56,7 @@ Distance(XPoint p1, XPoint p2)
 */
     
 int 
-InitTriangles(XParms xp, Parms p, int reps)
+InitTriangles(XParms xp, Parms p, int64_t reps)
 {
     int     i, j, numPoints;
     int     rows;
@@ -132,7 +132,7 @@ InitTriangles(XParms xp, Parms p, int reps)
 #ifndef POLYTRIANGLE_HACK
 
 void 
-DoTriangles(XParms xp, Parms p, int reps)
+DoTriangles(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
     XPoint  *curPoint;
@@ -207,7 +207,7 @@ XPolyTriangle(register Display *dpy,
 }
 
 void 
-DoTriangles(XParms xp, Parms p, int reps)
+DoTriangles(XParms xp, Parms p, int64_t reps)
 {
     int     i, j;
     XPoint  *curPoint;
diff --git a/do_valgc.c b/do_valgc.c
index 75f1a1a..68559f9 100644
--- a/do_valgc.c
+++ b/do_valgc.c
@@ -31,7 +31,7 @@ SOFTWARE.
 static Window win[2];
 
 int 
-InitGC(XParms xp, Parms p, int reps)
+InitGC(XParms xp, Parms p, int64_t reps)
 {
     win[0] = XCreateSimpleWindow(
 	xp->d, xp->w, 10, 10, 10, 10, 1, xp->foreground, xp->background);
@@ -42,7 +42,7 @@ InitGC(XParms xp, Parms p, int reps)
 }
 
 void 
-DoChangeGC(XParms xp, Parms p, int reps)
+DoChangeGC(XParms xp, Parms p, int64_t reps)
 {
     int		i;
     XGCValues   gcv;
diff --git a/do_windows.c b/do_windows.c
index 024d76b..ebd095a 100644
--- a/do_windows.c
+++ b/do_windows.c
@@ -42,7 +42,7 @@ ComputeSizes(XParms xp, Parms p)
 }
 
 int 
-CreateParents(XParms xp, Parms p, int reps)
+CreateParents(XParms xp, Parms p, int64_t reps)
 {
     int     i;
 
@@ -84,7 +84,7 @@ CreateParents(XParms xp, Parms p, int reps)
 
 
 void 
-MapParents(XParms xp, Parms p, int reps)
+MapParents(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -105,7 +105,7 @@ MapParentsCleanup(XParms xp, Parms p)
 
 
 int 
-InitCreate(XParms xp, Parms p, int reps)
+InitCreate(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
     MapParents(xp, p, reps);
@@ -129,7 +129,7 @@ CreateChildGroup(XParms xp, Parms p, Window parent)
 }
 
 void 
-CreateChildren(XParms xp, Parms p, int reps)
+CreateChildren(XParms xp, Parms p, int64_t reps)
 {
     int     i;
 
@@ -158,7 +158,7 @@ EndCreate(XParms xp, Parms p)
 
 
 int 
-InitMap(XParms xp, Parms p, int reps)
+InitMap(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
     CreateChildren(xp, p, reps);
@@ -166,7 +166,7 @@ InitMap(XParms xp, Parms p, int reps)
 }
 
 void 
-UnmapParents(XParms xp, Parms p, int reps)
+UnmapParents(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -186,7 +186,7 @@ UnmapParentsCleanup(XParms xp, Parms p)
 }
 
 int 
-InitDestroy(XParms xp, Parms p, int reps)
+InitDestroy(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
     CreateChildren(xp, p, reps);
@@ -195,7 +195,7 @@ InitDestroy(XParms xp, Parms p, int reps)
 }
 
 void 
-DestroyParents(XParms xp, Parms p, int reps)
+DestroyParents(XParms xp, Parms p, int64_t reps)
 {
     int i;
 
@@ -219,7 +219,7 @@ RenewParents(XParms xp, Parms p)
 }
 
 int 
-InitPopups(XParms xp, Parms p, int reps)
+InitPopups(XParms xp, Parms p, int64_t reps)
 {
 #ifdef CHILDROOT
     XWindowAttributes    xwa;
@@ -260,7 +260,7 @@ InitPopups(XParms xp, Parms p, int reps)
 }
 
 void 
-DoPopUps(XParms xp, Parms p, int reps)
+DoPopUps(XParms xp, Parms p, int64_t reps)
 {
     int i;
     for (i = 0; i != reps; i++) {
diff --git a/perfboth b/perfboth
index f529841..aa4769a 100644
--- a/perfboth
+++ b/perfboth
@@ -1,31 +1,26 @@
 #!/bin/sh
 awk '
-/^     1/ && READY == 0 {	printf ("    1   ");
+/^     1/ && READY == 0 {	printf ("       1   ");
 		for (i = 2; i < NF; i++)
-			printf ("          %2d        ", i);
-		printf ("   Operation\n");
+			printf ("             %2d             ", i);
+		printf ("    Operation\n");
 		next;
 	}
-/^---/	{ 	printf ("--------");
+/^---/	{ 	printf ("------------");
 		for (i = 2; i <= NF; i++)
-			printf ("   -----------------");
+			printf ("   -------------------------");
 		printf ("\n");
 		READY=1; next;
  	}
 READY==1 {
 		base=$1;
-		printf ("%8.1f", base);
+		printf ("%12.1f", base);
 		for (i = 2; i < '$1'; i++) {
 			if (base == 0)
-				printf ("   %8.1f         ", $i);
+				printf ("   %12.1f         ", $i);
 			else {
 				rate=$i/base;
-				if (rate < .1)
-					printf ("   %8.1f (%6.3f)", $i, rate);
-				else if (rate < 1000)
-					printf ("   %8.1f (%6.2f)", $i, rate);
-				else
-					printf ("   %8.1f (%6.0f)", $i, rate);
+				printf ("   %12.1f (%10.3f)", $i, rate);
 			}
 		}
 		printf ("   ");
diff --git a/perfratio b/perfratio
index 6ff3a12..fa0a912 100644
--- a/perfratio
+++ b/perfratio
@@ -1,31 +1,26 @@
 #!/bin/sh
 awk '
-/^     1/ && READY == 0 {	printf ("     1  ");
+/^     1/ && READY == 0 {	printf ("       1   ");
 		for (i = 2; i < NF; i++)
-			printf ("     %2d ", i);
-		printf ("   Operation\n");
+			printf ("       %2d   ", i);
+		printf ("    Operation\n");
 		next;
 	}
-/^---/	{ 	printf ("--------");
+/^---/	{ 	printf ("------------");
 		for (i = 2; i < NF; i++)
-			printf ("  ------");
+			printf ("  ----------");
 		printf ("   ---------\n");
 		READY=1; next;
  	}
 READY==1 {
 		base=$1;
-		printf ("%8.1f", base);
+		printf ("%12.1f", base);
 		for (i = 2; i < '$1'; i++) {
 			if (base == 0)
 				printf ("   lots ", $i);
 			else {
 				rate=$i/base;
-				if (rate < .1)
-					printf ("  %6.3f", rate);
-				else if (rate < 1000)
-					printf ("  %6.2f", rate);
-				else
-					printf ("  %6.0f", rate);
+				printf ("  %10.3f", rate);
 			}
 		}
 		printf ("   ");
diff --git a/x11perf.c b/x11perf.c
index 78bf633..b848960 100644
--- a/x11perf.c
+++ b/x11perf.c
@@ -24,6 +24,7 @@ SOFTWARE.
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
+#include <stdint.h>
 
 #ifndef VMS
 #include <X11/Xatom.h>
@@ -285,7 +286,7 @@ RoundTo3Digits(double d)
 
 
 static void 
-ReportTimes(double usecs, long long n, char *str, int average)
+ReportTimes(double usecs, int64_t n, char *str, int average)
 {
     double msecsperobj, objspersec;
 
@@ -299,15 +300,15 @@ ReportTimes(double usecs, long long n, char *str, int average)
         objspersec =  RoundTo3Digits(objspersec);
 
         if (average) {
-	    printf("%7lld trep @ %8.4f msec (%8.1f/sec): %s\n",
-		    n, msecsperobj, objspersec, str);
+	    printf("%11lld trep @ %8.4f msec (%8.1f/sec): %s\n", 
+                   (long long) n, msecsperobj, objspersec, str);
 	} else {
-	    printf("%7lld reps @ %8.4f msec (%8.1f/sec): %s\n",
-	        n, msecsperobj, objspersec, str);
+	    printf("%11lld reps @ %8.4f msec (%8.1f/sec): %s\n", 
+                   (long long) n, msecsperobj, objspersec, str);
 	}
     } else {
 	printf("%6lld %sreps @ 0.0 msec (unmeasurably fast): %s\n",
-	    n, average ? "t" : "", str);
+               (long long) n, average ? "t" : "", str);
     }
 
 }
@@ -526,7 +527,7 @@ NullProc(XParms xp, Parms p)
 }
 
 int 
-NullInitProc(XParms xp, Parms p, int reps)
+NullInitProc(XParms xp, Parms p, int64_t reps)
 {
     return reps;
 }
@@ -548,7 +549,7 @@ HardwareSync(XParms xp)
 }
 
 static void 
-DoHardwareSync(XParms xp, Parms p, int reps)    
+DoHardwareSync(XParms xp, Parms p, int64_t reps)    
 {
     int i;
     
@@ -626,7 +627,7 @@ DestroyClipWindows(XParms xp, int clips)
 
 
 static double 
-DoTest(XParms xp, Test *test, int reps)
+DoTest(XParms xp, Test *test, int64_t reps)
 {
     double  time;
     unsigned int ret_width, ret_height;
@@ -650,7 +651,7 @@ DoTest(XParms xp, Test *test, int reps)
 }
 
 
-static int 
+static int64_t
 CalibrateTest(XParms xp, Test *test, int seconds, double *usecperobj)
 {
 #define goal    2500000.0   /* Try to get up to 2.5 seconds		    */
@@ -658,7 +659,7 @@ CalibrateTest(XParms xp, Test *test, int seconds, double *usecperobj)
 #define tick      10000.0   /* Assume clock not faster than .01 seconds     */
 
     double  usecs;
-    int     reps, didreps;  /* Reps desired, reps performed		    */
+    int64_t reps, didreps;  /* Reps desired, reps performed		    */
     int     exponent;
 
     /* Attempt to get an idea how long each rep lasts by getting enough
@@ -875,8 +876,8 @@ ProcessTest(XParms xp, Test *test, int func, unsigned long pm, char *label)
 	}
 	if (repeat > 1) {
 	    ReportTimes(totalTime,
-		repeat * reps * test->parms.objects,
-		label, True);
+                        repeat * reps * test->parms.objects,
+                        label, True);
 	}
 	(*test->cleanup) (xp, &test->parms);
 	DestroyClipWindows(xp, test->clips);
diff --git a/x11perf.h b/x11perf.h
index 3d9c8ad..69dedec 100644
--- a/x11perf.h
+++ b/x11perf.h
@@ -102,8 +102,8 @@ typedef struct _XParms {
     Colormap	    cmap;
 } XParmRec, *XParms;
 
-typedef int (*InitProc)(XParms xp, Parms p, int reps);
-typedef void (*Proc)(XParms xp, Parms p, int reps);
+typedef int (*InitProc)(XParms xp, Parms p, int64_t reps);
+typedef void (*Proc)(XParms xp, Parms p, int64_t reps);
 typedef void (*CleanupProc)(XParms xp, Parms p);
 
 typedef enum {
@@ -129,7 +129,7 @@ typedef struct _Test {
 } Test;
 
 extern void NullProc(XParms xp, Parms p);
-extern int NullInitProc(XParms xp, Parms p, int reps);
+extern int NullInitProc(XParms xp, Parms p, int64_t reps);
 
 extern Test test[];
 
@@ -142,50 +142,50 @@ extern void AbortTest (void) _X_NORETURN;
 
 
 /* do_arcs.c */
-extern int InitCircles ( XParms xp, Parms p, int reps );
-extern int InitPartCircles ( XParms xp, Parms p, int reps );
-extern int InitChordPartCircles ( XParms xp, Parms p, int reps );
-extern int InitSlicePartCircles ( XParms xp, Parms p, int reps );
-extern int InitWideCircles ( XParms xp, Parms p, int reps );
-extern int InitPartWideCircles ( XParms xp, Parms p, int reps );
-extern int InitDashedCircles ( XParms xp, Parms p, int reps );
-extern int InitWideDashedCircles ( XParms xp, Parms p, int reps );
-extern int InitDoubleDashedCircles ( XParms xp, Parms p, int reps );
-extern int InitWideDoubleDashedCircles ( XParms xp, Parms p, int reps );
-extern int InitEllipses ( XParms xp, Parms p, int reps );
-extern int InitPartEllipses ( XParms xp, Parms p, int reps );
-extern int InitChordPartEllipses ( XParms xp, Parms p, int reps );
-extern int InitSlicePartEllipses ( XParms xp, Parms p, int reps );
-extern int InitWideEllipses ( XParms xp, Parms p, int reps );
-extern int InitPartWideEllipses ( XParms xp, Parms p, int reps );
-extern int InitDashedEllipses ( XParms xp, Parms p, int reps );
-extern int InitWideDashedEllipses ( XParms xp, Parms p, int reps );
-extern int InitDoubleDashedEllipses ( XParms xp, Parms p, int reps );
-extern int InitWideDoubleDashedEllipses ( XParms xp, Parms p, int reps );
-extern void DoArcs ( XParms xp, Parms p, int reps );
-extern void DoFilledArcs ( XParms xp, Parms p, int reps );
+extern int InitCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitPartCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitChordPartCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitSlicePartCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitWideCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitPartWideCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitDashedCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDashedCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitDoubleDashedCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDoubleDashedCircles ( XParms xp, Parms p, int64_t reps );
+extern int InitEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitPartEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitChordPartEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitSlicePartEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitWideEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitPartWideEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitDashedEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDashedEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitDoubleDashedEllipses ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDoubleDashedEllipses ( XParms xp, Parms p, int64_t reps );
+extern void DoArcs ( XParms xp, Parms p, int64_t reps );
+extern void DoFilledArcs ( XParms xp, Parms p, int64_t reps );
 extern void EndArcs ( XParms xp, Parms p );
 
 /* do_blt.c */
-extern int InitScroll ( XParms xp, Parms p, int reps );
-extern void DoScroll ( XParms xp, Parms p, int reps );
+extern int InitScroll ( XParms xp, Parms p, int64_t reps );
+extern void DoScroll ( XParms xp, Parms p, int64_t reps );
 extern void MidScroll ( XParms xp, Parms p );
 extern void EndScroll ( XParms xp, Parms p );
-extern int InitCopyWin ( XParms xp, Parms p, int reps );
-extern int InitCopyPix ( XParms xp, Parms p, int reps );
-extern int InitGetImage ( XParms xp, Parms p, int reps );
-extern int InitPutImage ( XParms xp, Parms p, int reps );
-extern void DoCopyWinWin ( XParms xp, Parms p, int reps );
-extern void DoCopyPixWin ( XParms xp, Parms p, int reps );
-extern void DoCopyWinPix ( XParms xp, Parms p, int reps );
-extern void DoCopyPixPix ( XParms xp, Parms p, int reps );
-extern void DoGetImage ( XParms xp, Parms p, int reps );
-extern void DoPutImage ( XParms xp, Parms p, int reps );
+extern int InitCopyWin ( XParms xp, Parms p, int64_t reps );
+extern int InitCopyPix ( XParms xp, Parms p, int64_t reps );
+extern int InitGetImage ( XParms xp, Parms p, int64_t reps );
+extern int InitPutImage ( XParms xp, Parms p, int64_t reps );
+extern void DoCopyWinWin ( XParms xp, Parms p, int64_t reps );
+extern void DoCopyPixWin ( XParms xp, Parms p, int64_t reps );
+extern void DoCopyWinPix ( XParms xp, Parms p, int64_t reps );
+extern void DoCopyPixPix ( XParms xp, Parms p, int64_t reps );
+extern void DoGetImage ( XParms xp, Parms p, int64_t reps );
+extern void DoPutImage ( XParms xp, Parms p, int64_t reps );
 #ifdef MITSHM
-extern int InitShmPutImage ( XParms xp, Parms p, int reps );
-extern int InitShmGetImage ( XParms xp, Parms p, int reps );
-extern void DoShmPutImage ( XParms xp, Parms p, int reps );
-extern void DoShmGetImage ( XParms xp, Parms p, int reps );
+extern int InitShmPutImage ( XParms xp, Parms p, int64_t reps );
+extern int InitShmGetImage ( XParms xp, Parms p, int64_t reps );
+extern void DoShmPutImage ( XParms xp, Parms p, int64_t reps );
+extern void DoShmGetImage ( XParms xp, Parms p, int64_t reps );
 extern void EndShmPutImage ( XParms xp, Parms p );
 extern void EndShmGetImage ( XParms xp, Parms p );
 #endif
@@ -193,142 +193,142 @@ extern void MidCopyPix ( XParms xp, Parms p );
 extern void EndCopyWin ( XParms xp, Parms p );
 extern void EndCopyPix ( XParms xp, Parms p );
 extern void EndGetImage ( XParms xp, Parms p );
-extern int InitCopyPlane ( XParms xp, Parms p, int reps );
-extern void DoCopyPlane ( XParms xp, Parms p, int reps );
+extern int InitCopyPlane ( XParms xp, Parms p, int64_t reps );
+extern void DoCopyPlane ( XParms xp, Parms p, int64_t reps );
 
 int
-InitCompositeWin(XParms xp, Parms p, int reps);
+InitCompositeWin(XParms xp, Parms p, int64_t reps);
 
 void
 EndCompositeWin (XParms xp, Parms p);
 
 void
-DoCompositeWinWin (XParms xp, Parms p, int reps);
+DoCompositeWinWin (XParms xp, Parms p, int64_t reps);
 
 int
-InitCompositePix(XParms xp, Parms p, int reps);
+InitCompositePix(XParms xp, Parms p, int64_t reps);
 
 void
 EndCompositePix (XParms xp, Parms p);
 
 void
-DoCompositePixWin (XParms xp, Parms p, int reps);
+DoCompositePixWin (XParms xp, Parms p, int64_t reps);
 
 /* do_complex.c */
-extern int InitComplexPoly ( XParms xp, Parms p, int reps );
-extern void DoComplexPoly ( XParms xp, Parms p, int reps );
+extern int InitComplexPoly ( XParms xp, Parms p, int64_t reps );
+extern void DoComplexPoly ( XParms xp, Parms p, int64_t reps );
 extern void EndComplexPoly ( XParms xp, Parms p );
-extern int InitGeneralPoly ( XParms xp, Parms p, int reps );
-extern void DoGeneralPoly ( XParms xp, Parms p, int reps );
+extern int InitGeneralPoly ( XParms xp, Parms p, int64_t reps );
+extern void DoGeneralPoly ( XParms xp, Parms p, int64_t reps );
 
 /* do_dots.c */
-extern int InitDots ( XParms xp, Parms p, int reps );
-extern void DoDots ( XParms xp, Parms p, int reps );
+extern int InitDots ( XParms xp, Parms p, int64_t reps );
+extern void DoDots ( XParms xp, Parms p, int64_t reps );
 extern void EndDots ( XParms xp, Parms p );
 
 /* do_lines.c */
-extern int InitLines ( XParms xp, Parms p, int reps );
-extern int InitWideLines ( XParms xp, Parms p, int reps );
-extern int InitDashedLines ( XParms xp, Parms p, int reps );
-extern int InitWideDashedLines ( XParms xp, Parms p, int reps );
-extern int InitDoubleDashedLines ( XParms xp, Parms p, int reps );
-extern int InitWideDoubleDashedLines ( XParms xp, Parms p, int reps );
-extern void DoLines ( XParms xp, Parms p, int reps );
+extern int InitLines ( XParms xp, Parms p, int64_t reps );
+extern int InitWideLines ( XParms xp, Parms p, int64_t reps );
+extern int InitDashedLines ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDashedLines ( XParms xp, Parms p, int64_t reps );
+extern int InitDoubleDashedLines ( XParms xp, Parms p, int64_t reps );
+extern int InitWideDoubleDashedLines ( XParms xp, Parms p, int64_t reps );
+extern void DoLines ( XParms xp, Parms p, int64_t reps );
 extern void EndLines ( XParms xp, Parms p );
 
 /* do_movewin.c */
-extern int InitMoveWindows ( XParms xp, Parms p, int reps );
-extern void DoMoveWindows ( XParms xp, Parms p, int reps );
+extern int InitMoveWindows ( XParms xp, Parms p, int64_t reps );
+extern void DoMoveWindows ( XParms xp, Parms p, int64_t reps );
 extern void EndMoveWindows ( XParms xp, Parms p );
-extern void DoResizeWindows ( XParms xp, Parms p, int reps );
-extern int InitCircWindows ( XParms xp, Parms p, int reps );
-extern void DoCircWindows ( XParms xp, Parms p, int reps );
+extern void DoResizeWindows ( XParms xp, Parms p, int64_t reps );
+extern int InitCircWindows ( XParms xp, Parms p, int64_t reps );
+extern void DoCircWindows ( XParms xp, Parms p, int64_t reps );
 extern void EndCircWindows ( XParms xp, Parms p );
-extern int InitMoveTree ( XParms xp, Parms p, int reps );
-extern void DoMoveTree ( XParms xp, Parms p, int reps );
+extern int InitMoveTree ( XParms xp, Parms p, int64_t reps );
+extern void DoMoveTree ( XParms xp, Parms p, int64_t reps );
 extern void EndMoveTree ( XParms xp, Parms p );
 
 /* do_rects.c */
-extern int InitRectangles ( XParms xp, Parms p, int reps );
-extern void DoRectangles ( XParms xp, Parms p, int reps );
-extern void DoOutlineRectangles ( XParms xp, Parms p, int reps );
+extern int InitRectangles ( XParms xp, Parms p, int64_t reps );
+extern void DoRectangles ( XParms xp, Parms p, int64_t reps );
+extern void DoOutlineRectangles ( XParms xp, Parms p, int64_t reps );
 extern void EndRectangles ( XParms xp, Parms p );
 
 /* do_segs.c */
-extern int InitSegments ( XParms xp, Parms p, int reps );
-extern int InitDashedSegments ( XParms xp, Parms p, int reps );
-extern int InitDoubleDashedSegments ( XParms xp, Parms p, int reps );
-extern int InitHorizSegments ( XParms xp, Parms p, int reps );
-extern int InitWideHorizSegments ( XParms xp, Parms p, int reps );
-extern int InitVertSegments ( XParms xp, Parms p, int reps );
-extern int InitWideVertSegments ( XParms xp, Parms p, int reps );
-extern void DoSegments ( XParms xp, Parms p, int reps );
+extern int InitSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitDashedSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitDoubleDashedSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitHorizSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitWideHorizSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitVertSegments ( XParms xp, Parms p, int64_t reps );
+extern int InitWideVertSegments ( XParms xp, Parms p, int64_t reps );
+extern void DoSegments ( XParms xp, Parms p, int64_t reps );
 extern void EndSegments ( XParms xp, Parms p );
 
 /* do_simple.c */
-extern void DoNoOp ( XParms xp, Parms p, int reps );
-extern void DoGetAtom ( XParms xp, Parms p, int reps );
-extern void DoQueryPointer ( XParms xp, Parms p, int reps );
-extern int InitGetProperty ( XParms xp, Parms p, int reps );
-extern void DoGetProperty ( XParms xp, Parms p, int reps );
+extern void DoNoOp ( XParms xp, Parms p, int64_t reps );
+extern void DoGetAtom ( XParms xp, Parms p, int64_t reps );
+extern void DoQueryPointer ( XParms xp, Parms p, int64_t reps );
+extern int InitGetProperty ( XParms xp, Parms p, int64_t reps );
+extern void DoGetProperty ( XParms xp, Parms p, int64_t reps );
 
 /* do_text.c */
-extern int InitText ( XParms xp, Parms p, int reps );
-extern int InitText16 ( XParms xp, Parms p, int reps );
-extern void DoText ( XParms xp, Parms p, int reps );
-extern void DoText16 ( XParms xp, Parms p, int reps );
-extern void DoPolyText ( XParms xp, Parms p, int reps );
-extern void DoPolyText16 ( XParms xp, Parms p, int reps );
-extern void DoImageText ( XParms xp, Parms p, int reps );
-extern void DoImageText16 ( XParms xp, Parms p, int reps );
+extern int InitText ( XParms xp, Parms p, int64_t reps );
+extern int InitText16 ( XParms xp, Parms p, int64_t reps );
+extern void DoText ( XParms xp, Parms p, int64_t reps );
+extern void DoText16 ( XParms xp, Parms p, int64_t reps );
+extern void DoPolyText ( XParms xp, Parms p, int64_t reps );
+extern void DoPolyText16 ( XParms xp, Parms p, int64_t reps );
+extern void DoImageText ( XParms xp, Parms p, int64_t reps );
+extern void DoImageText16 ( XParms xp, Parms p, int64_t reps );
 extern void ClearTextWin ( XParms xp, Parms p );
 extern void EndText ( XParms xp, Parms p );
 extern void EndText16 ( XParms xp, Parms p );
 #ifdef XFT
-extern int InitAAText (XParms xp, Parms p, int reps );
-extern void DoAAText (XParms xp, Parms p, int reps );
+extern int InitAAText (XParms xp, Parms p, int64_t reps );
+extern void DoAAText (XParms xp, Parms p, int64_t reps );
 extern void EndAAText ( XParms xp, Parms p );
 #endif
 
 /* do_traps.c */
-extern int InitTrapezoids ( XParms xp, Parms p, int reps );
-extern void DoTrapezoids ( XParms xp, Parms p, int reps );
+extern int InitTrapezoids ( XParms xp, Parms p, int64_t reps );
+extern void DoTrapezoids ( XParms xp, Parms p, int64_t reps );
 extern void EndTrapezoids ( XParms xp, Parms p );
 #if defined(XRENDER) && defined(XFT)
-extern int InitFixedTraps ( XParms xp, Parms p, int reps );
-extern void DoFixedTraps ( XParms xp, Parms p, int reps );
+extern int InitFixedTraps ( XParms xp, Parms p, int64_t reps );
+extern void DoFixedTraps ( XParms xp, Parms p, int64_t reps );
 extern void EndFixedTraps ( XParms xp, Parms p );
-extern int InitFixedTrapezoids ( XParms xp, Parms p, int reps );
-extern void DoFixedTrapezoids ( XParms xp, Parms p, int reps );
+extern int InitFixedTrapezoids ( XParms xp, Parms p, int64_t reps );
+extern void DoFixedTrapezoids ( XParms xp, Parms p, int64_t reps );
 extern void EndFixedTrapezoids ( XParms xp, Parms p );
 #endif
 
 /* do_tris.c */
-extern int InitTriangles ( XParms xp, Parms p, int reps );
-extern void DoTriangles ( XParms xp, Parms p, int reps );
+extern int InitTriangles ( XParms xp, Parms p, int64_t reps );
+extern void DoTriangles ( XParms xp, Parms p, int64_t reps );
 extern void EndTriangles ( XParms xp, Parms p );
 
 /* do_valgc.c */
-extern int InitGC ( XParms xp, Parms p, int reps );
-extern void DoChangeGC ( XParms xp, Parms p, int reps );
+extern int InitGC ( XParms xp, Parms p, int64_t reps );
+extern void DoChangeGC ( XParms xp, Parms p, int64_t reps );
 extern void EndGC ( XParms xp, Parms p );
 
 /* do_windows.c */
-extern int CreateParents ( XParms xp, Parms p, int reps );
-extern void MapParents ( XParms xp, Parms p, int reps );
+extern int CreateParents ( XParms xp, Parms p, int64_t reps );
+extern void MapParents ( XParms xp, Parms p, int64_t reps );
 extern void MapParentsCleanup ( XParms xp, Parms p );
-extern int InitCreate ( XParms xp, Parms p, int reps );
-extern void CreateChildren ( XParms xp, Parms p, int reps );
+extern int InitCreate ( XParms xp, Parms p, int64_t reps );
+extern void CreateChildren ( XParms xp, Parms p, int64_t reps );
 extern void DestroyChildren ( XParms xp, Parms p );
 extern void EndCreate ( XParms xp, Parms p );
-extern int InitMap ( XParms xp, Parms p, int reps );
-extern void UnmapParents ( XParms xp, Parms p, int reps );
+extern int InitMap ( XParms xp, Parms p, int64_t reps );
+extern void UnmapParents ( XParms xp, Parms p, int64_t reps );
 extern void UnmapParentsCleanup ( XParms xp, Parms p);
-extern int InitDestroy ( XParms xp, Parms p, int reps );
-extern void DestroyParents ( XParms xp, Parms p, int reps );
+extern int InitDestroy ( XParms xp, Parms p, int64_t reps );
+extern void DestroyParents ( XParms xp, Parms p, int64_t reps );
 extern void RenewParents ( XParms xp, Parms p );
-extern int InitPopups ( XParms xp, Parms p, int reps );
-extern void DoPopUps ( XParms xp, Parms p, int reps );
+extern int InitPopups ( XParms xp, Parms p, int64_t reps );
+extern void DoPopUps ( XParms xp, Parms p, int64_t reps );
 extern void EndPopups ( XParms xp, Parms p );