XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

1 files changed, 1 insertions, 14 deletions

diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c
index 53eb3b314..660cc356b 100644
--- a/hw/xfree86/xf4bpp/vgaBitBlt.c
+++ b/hw/xfree86/xf4bpp/vgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
 /* GJA -- span move routines */
 
 
@@ -101,33 +101,23 @@ static unsigned char rmasktab[] = {
 	}
 
 static void aligned_blit(
-#if NeedFunctionPrototypes
     WindowPtr, int, int, int, int, int, int, int, int
-#endif
 );
 
 static void aligned_blit_center(
-#if NeedFunctionPrototypes
     WindowPtr, int, int, int, int, int, int
-#endif
 );
 
 static void shift(
-#if NeedFunctionPrototypes
     WindowPtr, int, int, int, int, int, int, int
-#endif
 );
 
 static void shift_thin_rect(
-#if NeedFunctionPrototypes
     WindowPtr, int, int, int, int, int, int, int
-#endif
 );
 
 static void shift_center(
-#if NeedFunctionPrototypes
     WindowPtr, int, int, int, int, int, int, int
-#endif
 );
 
 void xf4bppBitBlt(pWin,alu,writeplanes,x0,y0,x1,y1,w,h)
@@ -535,13 +525,10 @@ int h;
   int pad;
   int htmp, wtmp; /* Temporaries for indices over height and width */
   volatile unsigned char tmp; /* Temporary result of the shifts */
-  int bs;
   int bytecnt;
   
   volatile unsigned char *sp, *dp;
 
-  bs = (x1 - x0) & WMASK;
-
   if ( l1 ) {
      bytecnt = (w - (WORDSZ - l1) - r1) >> WSHIFT;
      sp = SMEM( ((x0 + (WORDSZ - l1)) >> WSHIFT), y0);