merge latest (4.3.99.16) from XFree86 (vendor) branch

16 files changed, 63 insertions, 270 deletions

diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c
index a2d24f4d9..650c448b8 100644
--- a/hw/xfree86/xf4bpp/emulTile.c
+++ b/hw/xfree86/xf4bpp/emulTile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -178,7 +178,6 @@ register int x0, y0, w, h ;
 int xSrc ;
 int ySrc ;
 {
-ScreenPtr pScreen ;
 int xOffset ;
 int yOffset ;
 int width, height;
@@ -186,7 +185,6 @@ int width, height;
 TRACE( ( "xf4bppTileRect(pTile=x%x,alu=x%x,planes=x%02x,x0=%d,y0=%d,w=%d,h=%d,xSrc=%d,ySrc=%d\n",
 		pTile, alu, planes, x0, y0, w, h, xSrc, ySrc ) ) ;
 
-     pScreen = pTile->drawable.pScreen ;
      switch ( alu ) {
 	case GXclear:		/* 0x0 Zero 0 */
 	case GXinvert:		/* 0xa NOT dst */
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index 14c2ccb66..4c4d8eab6 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
@@ -244,16 +244,16 @@ xf4bppPolyFillArcSolid
     xArc	*parcs
 )
 {
-    mfbPrivGC *priv;
     register xArc *arc;
     register int i;
     BoxRec box;
     RegionPtr cclip;
+#if 0
+    mfbPrivGC *priv;
     int rop;
 
     priv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
     rop = priv->rop;
-#if 0
     if ((rop == RROP_NOP) || !(pGC->planemask & 1))
 #else
     if ( !(pGC->planemask & 0x0F))
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index cb2e63125..a5d5b5b37 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.7 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */
 
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
@@ -101,7 +101,6 @@ xoff, pdst, pglyph, and tmpSrc seem like the right things, though.
 
 /* Forward declarations -- GJA */
 static void doImageGlyphBlt(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GC *,
     int,
@@ -110,7 +109,6 @@ static void doImageGlyphBlt(
     CharInfoPtr *,
     unsigned char *,
     ExtentInfoRec *
-#endif
 );
 
 void
@@ -352,7 +350,9 @@ doImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,infop)
 	int glyphRow;		/* first row of glyph not wholly
 				   clipped out */
 	int glyphCol;		/* leftmost visible column of glyph */
+#if GETLEFTBITS_ALIGNMENT > 1
 	int getWidth;		/* bits to get from glyph */
+#endif
 
 	if(!(ppos = (TEXTPOS *)ALLOCATE_LOCAL(nglyph * sizeof(TEXTPOS))))
 	    return;
@@ -452,7 +452,9 @@ doImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,infop)
 
 		glyphCol = (leftEdge - ppos[i].xpos) -
 			   (pci->metrics.leftSideBearing);
+#if GETLEFTBITS_ALIGNMENT > 1
 		getWidth = w + glyphCol;
+#endif
 		xoff = xchar + (leftEdge - ppos[i].xpos);
 		if (xoff > PLST)
 		{
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index dc85e3d92..c2717599f 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -92,9 +92,7 @@ actual clipping.
 */
 #ifdef POLYSEGMENT
 static void DoV16SegmentSS(
-#if NeedFunctionPrototypes
     DrawablePtr, GCPtr, int, xSegment*
-#endif
 );
 
 void
@@ -113,9 +111,7 @@ xf4bppSegmentSS (pDrawable, pGC, nseg, pSeg)
 
 #else
 static void DoV16LineSS(
-#if NeedFunctionPrototypes
     DrawablePtr, GCPtr, int, int, DDXPointPtr
-#endif
 );
 
 void
@@ -182,13 +178,14 @@ DoV16LineSS (pDrawable, pGC, mode, npt, pptInit)
     register int y1, y2;
     register int x1, x2;
     RegionPtr cclip;
-    int		    alu;
+#ifndef POLYSEGMENT
+    int	     alu = pGC->alu; /* GJA */
+#endif
 
     if (!(pGC->planemask & 0x0F))
 	return;
 
     cclip = pGC->pCompositeClip;
-    alu = pGC->alu; /* GJA */
     pboxInit = REGION_RECTS(cclip);
     nboxInit = REGION_NUM_RECTS(cclip);
 
@@ -499,9 +496,7 @@ DoV16LineSS (pDrawable, pGC, mode, npt, pptInit)
 
 #ifdef POLYSEGMENT
 static void DoV16SegmentSD(
-#if NeedFunctionPrototypes
     DrawablePtr, GCPtr, int, xSegment*
-#endif
 );
 
 void
@@ -520,9 +515,7 @@ xf4bppSegmentSD (pDrawable, pGC, nseg, pSeg)
 
 #else
 static void DoV16LineSD(
-#if NeedFunctionPrototypes
     DrawablePtr, GCPtr, int, int, DDXPointPtr
-#endif
 );
 
 void
@@ -803,10 +796,7 @@ dontStep:	;
 		(y2 <  pbox->y2))
 	    {
 		unsigned long _mask;
-		int ink;
 
-		ink = fgink;
-		if (dashIndex & 1) ink = bgink;
 		_mask = mask[x2 & PIM];
 		addrl = mfbScanline(addrl, x2, y2, nlwidth);
 		UPDRW(addrl,_mask);
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index e5202c267..86b7d6f6c 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.5 2000/09/26 15:57:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -71,31 +71,19 @@ vga16DoBitblt
     unsigned long   planemask
 )
 {
-    CARD32 *psrcBase, *pdstBase;	
-				/* start of src and dst bitmaps */
     int widthSrc, widthDst;	/* add to get to same position in next line */
-
     BoxPtr pbox;
     int nbox;
-
     BoxPtr pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2;
 				/* temporaries for shuffling rectangles */
     DDXPointPtr pptTmp, pptNew1, pptNew2;
 				/* shuffling boxes entails shuffling the
 				   source points too */
     int w, h;
-    int xdir;			/* 1 = left right, -1 = right left/ */
-    int ydir;			/* 1 = top down, -1 = bottom up */
-
-    MROP_DECLARE_REG()
-
     int careful;
 
-    MROP_INITIALIZE(alu,planemask);
-
-    cfbGetLongWidthAndPointer (pSrc, widthSrc, psrcBase)
-
-    cfbGetLongWidthAndPointer (pDst, widthDst, pdstBase)
+    widthSrc = cfbGetLongWidth(pSrc);
+    widthDst = cfbGetLongWidth(pDst);
 
     /* XXX we have to err on the side of safety when both are windows,
      * because we don't know if IncludeInferiors is being used.
@@ -114,7 +102,6 @@ vga16DoBitblt
     if (careful && (pptSrc->y < pbox->y1))
     {
         /* walk source botttom to top */
-	ydir = -1;
 	widthSrc = -widthSrc;
 	widthDst = -widthDst;
 
@@ -151,17 +138,9 @@ vga16DoBitblt
 	    pptSrc = pptNew1;
         }
     }
-    else
-    {
-	/* walk source top to bottom */
-	ydir = 1;
-    }
 
     if (careful && (pptSrc->x < pbox->x1))
     {
-	/* walk source right to left */
-        xdir = -1;
-
 	if (nbox > 1)
 	{
 	    /* reverse order of rects in each band */
@@ -199,11 +178,6 @@ vga16DoBitblt
 	    pptSrc = pptNew2;
 	}
     }
-    else
-    {
-	/* walk source left to right */
-        xdir = 1;
-    }
 
     while(nbox--)
     {
@@ -424,7 +398,7 @@ int dstx, dsty;
 	    /* Check to see if the region is empty */
 	    if (fastBox.x1 >= fastBox.x2 || fastBox.y1 >= fastBox.y2)
 	    {
-		REGION_INIT(pGC->pScreen, &rgnDst, NullBox, 0);
+		REGION_NULL(pGC->pScreen, &rgnDst);
 	    }
 	    else
 	    {
diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c
index 7e1c866ef..af1ecb95e 100644
--- a/hw/xfree86/xf4bpp/ppcFillRct.c
+++ b/hw/xfree86/xf4bpp/ppcFillRct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -82,18 +82,10 @@ xf4bppPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
     int		    numRects;
     int		    n;
     int		    xorg, yorg;
-    mfbPrivGC	*priv;
-/*    int alu; */
-/*    mfbFillAreaProcPtr pfn; */
-/*    PixmapPtr ppix; */
 
     if (!(pGC->planemask & 0x0F)) /* GJA */
 	return;
 
-    priv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
-/*    alu = priv->ropFillArea; */
-/*    pfn = priv->FillArea; */
-/*    ppix = pGC->pRotatedPixmap; */
     prgnClip = pGC->pCompositeClip;
 
     prect = prectInit;
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index 5f863fa73..341e17534 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -79,17 +79,13 @@ typedef ppcPrivGC *ppcPrivGCPtr ;
 
 /* ppcCReduce.c */
 void xf4bppGetReducedColorRrop(
-#if NeedFunctionPrototypes
     GCPtr,
     int,
     ppcReducedRrop *
-#endif
 );
 
 /* vgaGC.c */
 void xf4bppChangeGCtype(
-#if NeedFunctionPrototypes
     GCPtr,
     ppcPrivGCPtr
-#endif
 );
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index 43cc7bd33..f6999c561 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5 2001/10/28 03:34:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
 /*
 
 Copyright (c) 1990  X Consortium
@@ -77,7 +77,7 @@ static VisualRec vgaVisuals[] = {
 } ;
 #endif
 
-int
+void
 xf4bppNeverCalled()
 {
 	FatalError("xf4bppNeverCalled was nevertheless called\n");
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index 261c8e809..c009d696e 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4 2001/08/01 00:44:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -126,16 +126,16 @@ xf4bppSolidPixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
 	return ;
 
     n = nInit * miFindMaxBand(pGC->pCompositeClip) ;
-    if ( !( pwidth = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
+    if ( !( pwidthFree = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
 	return ;
-    pwidthFree = pwidth ;
+    pwidth = pwidthFree ;
 
-    if ( !( ppt = (DDXPointRec *)
+    if ( !( pptFree = (DDXPointRec *)
 	    ALLOCATE_LOCAL( n * sizeof( DDXPointRec ) ) ) ) {
 	DEALLOCATE_LOCAL( pwidth ) ;
 	return ;
     }
-    pptFree = ppt ;
+    ppt = pptFree ;
 
     n = miClipSpans( pGC->pCompositeClip, pptInit, pwidthInit, nInit,
 	ppt, pwidth, fSorted ) ;
@@ -260,8 +260,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		pptFree, pwidth, ppt, fSorted ) ;
 
     pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
     fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
@@ -359,8 +359,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		 ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		 pptFree, pwidth, ppt, fSorted ) ;
 
     fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
     bg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.bgPixel ;
@@ -462,8 +462,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		 ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		 pptFree, pwidth, ppt, fSorted ) ;
 
     /* the following code is for 8 bits per pixel addressable memory only */
     pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index e61fed342..f52343fc9 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -80,18 +80,14 @@ SOFTWARE.
 
 /* NOTE: These functions only work for visuals up to 31-bits deep */
 static void xf4bppPaintWindowSolid(
-#if NeedFunctionPrototypes
     WindowPtr,
     RegionPtr,
     int 
-#endif
 );
 static void xf4bppPaintWindowTile(
-#if NeedFunctionPrototypes
     WindowPtr,
     RegionPtr,
     int 
-#endif
 );
 
 void
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index 29d466f00..fc38cdcfe 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -98,16 +98,16 @@ xf4bppSolidWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
 	return ;
 
     n = nInit * miFindMaxBand( pGC->pCompositeClip ) ;
-    if ( !( pwidth = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
+    if ( !( pwidthFree = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
 	return ;
-    pwidthFree = pwidth ;
+    pwidth = pwidthFree ;
 
-    if ( !( ppt = (DDXPointRec *)
+    if ( !( pptFree = (DDXPointRec *)
 			ALLOCATE_LOCAL( n * sizeof( DDXPointRec ) ) ) ) {
 	DEALLOCATE_LOCAL( pwidth ) ;
 	return ;
     }
-    pptFree = ppt ;
+    ppt = pptFree ;
 
     n = miClipSpans( pGC->pCompositeClip, pptInit, pwidthInit, nInit,
 	ppt, pwidth, fSorted ) ;
@@ -164,8 +164,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		 ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		 pptFree, pwidth, ppt, fSorted ) ;
 
     pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
     fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
@@ -216,8 +216,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		 ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		 pptFree, pwidth, ppt, fSorted ) ;
 
     pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
     fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
@@ -261,8 +261,8 @@ int fSorted ;
     if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
 	return ;
 
-    SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
-		 ppt, pwidthFree, pptFree, fSorted ) ;
+    SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+		 pptFree, pwidth, ppt, fSorted ) ;
 
     xSrc = pGC->patOrg.x + pDrawable->x ;
     ySrc = pGC->patOrg.y + pDrawable->y ;
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);
diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c
index 66c2c14e0..4357e4d8a 100644
--- a/hw/xfree86/xf4bpp/vgaImages.c
+++ b/hw/xfree86/xf4bpp/vgaImages.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -117,10 +117,7 @@ register unsigned char tmp1;
 		default:
 			break ;
 	}
-#ifndef PC98_EGC
-	if ( invert_existing_data )
-		xf4bppFillSolid( pWin, VGA_ALLPLANES, GXinvert, planes, x, y, w, h ) ;
-#endif
+
 #ifdef	PC98_EGC
 	/* Setup EGC Registers */
 	switch(data_rotate_value) {
@@ -153,6 +150,8 @@ register unsigned char tmp1;
 	outw(EGC_FGC, 0x0000);
 	tmp1 = 0;
 #else
+	if ( invert_existing_data )
+		xf4bppFillSolid( pWin, VGA_ALLPLANES, GXinvert, planes, x, y, w, h ) ;
 	/* Setup VGA Registers */
 	SetVideoSequencer( Mask_MapIndex, planes & VGA_ALLPLANES ) ;
 	/* Set Raster Op */
@@ -205,6 +204,7 @@ if ( invert_source_data )
 			SetVideoGraphics( Bit_MaskIndex, currMask ) ;
 			/* Read To Load vga Data Latches */
 			tmp = *( (VgaMemoryPtr) dst ) ;
+			(void) tmp;
 			*( (VgaMemoryPtr) dst ) = ~ *src ;
 			if ( currMask & RightmostBit ) {
 				currMask = LeftmostBit ;
@@ -256,6 +256,7 @@ else /* invert_source_data == FALSE */
 			SetVideoGraphics( Bit_MaskIndex, currMask ) ; /* GJA */
 			/* Read To Load vga Data Latches */
 			tmp = *( (VgaMemoryPtr) dst ) ;
+			(void) tmp;
 			*( (VgaMemoryPtr) dst ) = *src ;
 			if ( currMask & RightmostBit ) {
 				currMask = LeftmostBit ;
diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c
index ceb39ef77..b3711f852 100644
--- a/hw/xfree86/xf4bpp/vgaSolid.c
+++ b/hw/xfree86/xf4bpp/vgaSolid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -117,7 +117,7 @@ register const unsigned int notZero = ((unsigned char)(~0x0));
 register int tmp ;
 
 #define SINGLE_STORE \
-    tmp = *( (VgaMemoryPtr) destination ) ; \
+    tmp = *( (VgaMemoryPtr) destination ) ;  (void)tmp; \
     ( *( (VgaMemoryPtr) destination ) = notZero ) ; \
     destination++; stop_count-- ;
 
@@ -282,6 +282,7 @@ if ((tmp = x0 & 07)) {
 		for ( tmp = ly;
 		      tmp-- ; ) {
 			tmp3 = *( (VgaMemoryPtr) dst ) ;
+			(void)tmp3;
 			*( (VgaMemoryPtr) dst ) = tmp2 ;
 			dst += BYTES_PER_LINE(pWin);
 		}
@@ -293,6 +294,7 @@ if ((tmp = x0 & 07)) {
 	for ( tmp = ly;
 	      tmp-- ; ) {
 		tmp3 = *( (VgaMemoryPtr) dst ) ;
+		(void)tmp3;
 		*( (VgaMemoryPtr) dst ) = tmp2 ;
 		dst += BYTES_PER_LINE(pWin);
 	}
@@ -333,6 +335,7 @@ if ((tmp = BIT_OFFSET(lx))) { /* x0 Now Is Byte Aligned */
 		for ( tmp = ly; 
 		      tmp-- ; ) {
 			tmp3 = *( (VgaMemoryPtr) dst ) ;
+			(void)tmp3;
 			*( (VgaMemoryPtr) dst ) = tmp2 ;
 			dst += BYTES_PER_LINE(pWin);
 		}
@@ -344,6 +347,7 @@ if ((tmp = BIT_OFFSET(lx))) { /* x0 Now Is Byte Aligned */
 	for ( tmp = ly; 
 	      tmp-- ; ) {
 		tmp3 = *( (VgaMemoryPtr) dst ) ;
+		(void)tmp3;
 		*( (VgaMemoryPtr) dst ) = tmp2 ;
 		dst += BYTES_PER_LINE(pWin) ;
 	}
diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c
index a4f3cef6b..f5ace74d0 100644
--- a/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/hw/xfree86/xf4bpp/vgaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -388,7 +388,9 @@ if ((byte_cnt = ROW_OFFSET(w))) { /* Fill The Center Of The Box */
 		      tmp2-- ;
 		      dst++ ) {
 			register unsigned bitPattern ;
+#ifndef PC98_EGC
 			register VideoAdapterObject tmp3 ;
+#endif
 			/*
 			 * For Each Time Pattern Repeats In Y
 			 */
@@ -408,6 +410,7 @@ if ((byte_cnt = ROW_OFFSET(w))) { /* Fill The Center Of The Box */
 #ifndef	PC98_EGC
 				/* Read To Save */
 				tmp3 = *( (VgaMemoryPtr) xDst) ;
+				(void)tmp3;
 #endif
 				/* Write Pattern */
 				*( (VgaMemoryPtr) xDst ) = bitPattern ;
diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h
index f9141e5e1..59458a258 100644
--- a/hw/xfree86/xf4bpp/xf4bpp.h
+++ b/hw/xfree86/xf4bpp/xf4bpp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.8 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */
 
 
 #ifndef __XF4BPP_H__
@@ -15,58 +15,45 @@
 
 /* ppcArea.c */
 void xf4bppFillArea(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     BoxPtr,
     GCPtr
-#endif
 );
 
 /* ppcBStore.c */
 void xf4bppSaveAreas(
-#if NeedFunctionPrototypes
     PixmapPtr,
     RegionPtr,
     int,
     int,
     WindowPtr
-#endif
 );
 void xf4bppRestoreAreas(
-#if NeedFunctionPrototypes
     PixmapPtr,
     RegionPtr,
     int,
     int,
     WindowPtr
-#endif
 );
 
 /* ppcClip.c */
 void xf4bppDestroyClip(
-#if NeedFunctionPrototypes
     GCPtr
-#endif
 );
 void xf4bppChangeClip(
-#if NeedFunctionPrototypes
     GCPtr,
     int,
     pointer,
     int
-#endif
 );
 void xf4bppCopyClip(
-#if NeedFunctionPrototypes
     GCPtr,
     GCPtr
-#endif
 );
 
 /* ppcCpArea.c */
 RegionPtr xf4bppCopyArea(
-#if NeedFunctionPrototypes
     DrawablePtr,
     DrawablePtr,
     GCPtr,
@@ -76,145 +63,115 @@ RegionPtr xf4bppCopyArea(
     int,
     int,
     int
-#endif
 );
 
 /* ppcDepth.c */
 Bool xf4bppDepthOK(
-#if NeedFunctionPrototypes
     DrawablePtr,
     int
-#endif
 );
 
 /* ppcFillRct.c */
 void xf4bppPolyFillRect(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xRectangle *
-#endif
 );
 
 /* ppcWindowFS.c */
 void xf4bppSolidWindowFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppStippleWindowFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppOpStippleWindowFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppTileWindowFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 
 /* xf4bppPixmapFS.c */
 void xf4bppSolidPixmapFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppStipplePixmapFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppOpStipplePixmapFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 void xf4bppTilePixmapFS(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     DDXPointPtr,
     int *,
     int
-#endif
 );
 
 /* ppcGC.c */
 Bool xf4bppCreateGC(
-#if NeedFunctionPrototypes
     GCPtr
-#endif
 );
 void xf4bppDestroyGC(
-#if NeedFunctionPrototypes
     GC *
-#endif
 );
 void xf4bppValidateGC(
-#if NeedFunctionPrototypes
     GCPtr,
     unsigned long,
     DrawablePtr
-#endif
 );
 
 /* ppcGetSp.c */
 void xf4bppGetSpans(
-#if NeedFunctionPrototypes
     DrawablePtr,
     int,
     DDXPointPtr,
     int *,
     int,
     char *
-#endif
 );
 
 /* ppcImg.c */
 void xf4bppGetImage(
-#if NeedFunctionPrototypes
     DrawablePtr,
     int,
     int,
@@ -223,110 +180,86 @@ void xf4bppGetImage(
     unsigned int,
     unsigned long,
     char *
-#endif
 );
 
 /* ppcLine.c */
 void xf4bppScrnZeroLine(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     int,
     DDXPointPtr
-#endif
 );
 void xf4bppScrnZeroDash(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     int,
     DDXPointPtr
-#endif
 );
 void xf4bppScrnZeroSegs(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xSegment *
-#endif
 );
 
 /* ppcPixmap.c */
 PixmapPtr xf4bppCreatePixmap(
-#if NeedFunctionPrototypes
     ScreenPtr,
     int,
     int,
     int
-#endif
 );
 PixmapPtr xf4bppCopyPixmap(
-#if NeedFunctionPrototypes
     PixmapPtr
-#endif
 );
 
 /* ppcPntWin.c */
 void xf4bppPaintWindow(
-#if NeedFunctionPrototypes
     WindowPtr,
     RegionPtr,
     int
-#endif
 );
 
 /* ppcPolyPnt.c */
 void xf4bppPolyPoint(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     int,
     xPoint *
-#endif
 );
 
 /* ppcPolyRec.c */
 void xf4bppPolyRectangle(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xRectangle *
-#endif
 );
 
 /* ppcQuery.c */
 void xf4bppQueryBestSize(
-#if NeedFunctionPrototypes
     int,
     unsigned short *,
     unsigned short *,
     ScreenPtr
-#endif
 );
 
 /* ppcRslvC.c */
 void xf4bppResolveColor(
-#if NeedFunctionPrototypes
     unsigned short *,
     unsigned short *,
     unsigned short *,
     VisualPtr
-#endif
 );
 Bool xf4bppInitializeColormap(
-#if NeedFunctionPrototypes
     ColormapPtr
-#endif
 );
 
 /* ppcSetSp.c */
 void xf4bppSetSpans(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     char *,
@@ -334,45 +267,33 @@ void xf4bppSetSpans(
     int *,
     int,
     int
-#endif
 );
 
 /* ppcWindow.c */
 void xf4bppCopyWindow(
-#if NeedFunctionPrototypes
     WindowPtr,
     DDXPointRec,
     RegionPtr
-#endif
 );
 Bool xf4bppPositionWindow(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int
-#endif
 );
 Bool xf4bppUnrealizeWindow(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int
-#endif
 );
 Bool xf4bppDestroyWindow(
-#if NeedFunctionPrototypes
     WindowPtr
-#endif
 );
 Bool xf4bppCreateWindowForXYhardware(
-#if NeedFunctionPrototypes
     WindowPtr
-#endif
 );
 
 /* emulOpStip.c */
 void xf4bppOpaqueStipple(
-#if NeedFunctionPrototypes
     WindowPtr,
     PixmapPtr,
     unsigned long int,
@@ -385,12 +306,10 @@ void xf4bppOpaqueStipple(
     int,
     int,
     int
-#endif
 );
 
 /* emulRepAre.c */
 void xf4bppReplicateArea(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -399,12 +318,10 @@ void xf4bppReplicateArea(
     int,
     int,
     int
-#endif
 );
 
 /* emulTile.c */
 void xf4bppTileRect(
-#if NeedFunctionPrototypes
     WindowPtr,
     PixmapPtr,
     const int,
@@ -415,20 +332,16 @@ void xf4bppTileRect(
     int,
     int,
     int
-#endif
 );
 
 /* vgaGC.c */
 Mask xf4bppChangeWindowGC(
-#if NeedFunctionPrototypes
     GCPtr,
     Mask
-#endif
 );
 
 /* vgaBitBlt.c */
 void xf4bppBitBlt(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -438,12 +351,10 @@ void xf4bppBitBlt(
     int,
     int,
     int
-#endif
 );
 
 /* vgaImages.c */
 void xf4bppDrawColorImage(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -453,10 +364,8 @@ void xf4bppDrawColorImage(
     int,
     const int,
     const unsigned long int
-#endif
 );
 void xf4bppReadColorImage(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -464,12 +373,10 @@ void xf4bppReadColorImage(
     int,
     unsigned char *,
     int
-#endif
 );
 
 /* vgaLine.c */
 void xf4bppHorzLine(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned long int,
     int,
@@ -477,10 +384,8 @@ void xf4bppHorzLine(
     int,
     int,
     int
-#endif
 );
 void xf4bppVertLine(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned long int,
     int,
@@ -488,10 +393,8 @@ void xf4bppVertLine(
     int,
     int,
     int
-#endif
 );
 void xf4bppBresLine(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned long int,
     int,
@@ -505,12 +408,10 @@ void xf4bppBresLine(
     int,
     int,
     unsigned long int
-#endif
 );
 
 /* vgaStipple.c */
 void xf4bppFillStipple(
-#if NeedFunctionPrototypes
     WindowPtr,
     const PixmapPtr,
     unsigned long int,
@@ -522,12 +423,10 @@ void xf4bppFillStipple(
     int,
     const int,
     const int
-#endif
 );
 
 /* vgaSolid.c */
 void xf4bppFillSolid(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned long int,
     const int,
@@ -536,12 +435,10 @@ void xf4bppFillSolid(
     const int,
     int,
     const int
-#endif
 );
 
 /* offscreen.c */
 void xf4bppOffBitBlt(
-#if NeedFunctionPrototypes
     WindowPtr,
     const int,
     const int,
@@ -551,10 +448,8 @@ void xf4bppOffBitBlt(
     int,
     int,
     int
-#endif
 );
 void xf4bppOffDrawColorImage(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -564,10 +459,8 @@ void xf4bppOffDrawColorImage(
     int,
     const int,
     const unsigned long int
-#endif
 );
 void xf4bppOffReadColorImage(
-#if NeedFunctionPrototypes
     WindowPtr,
     int,
     int,
@@ -575,10 +468,8 @@ void xf4bppOffReadColorImage(
     int,
     unsigned char *,
     int
-#endif
 );
 void xf4bppOffFillSolid(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned long int,
     const int,
@@ -587,10 +478,8 @@ void xf4bppOffFillSolid(
     const int,
     int,
     const int
-#endif
 );
 void xf4bppOffDrawMonoImage(
-#if NeedFunctionPrototypes
     WindowPtr,
     unsigned char *,
     int,
@@ -600,10 +489,8 @@ void xf4bppOffDrawMonoImage(
     unsigned long int,
     int,
     unsigned long int
-#endif
 );
 void xf4bppOffFillStipple(
-#if NeedFunctionPrototypes
     WindowPtr,
     const PixmapPtr,
     unsigned long int,
@@ -615,12 +502,10 @@ void xf4bppOffFillStipple(
     int,
     const int,
     const int
-#endif
 );
 
 /* mfbimggblt.c */
 void xf4bppImageGlyphBlt(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
@@ -628,24 +513,18 @@ void xf4bppImageGlyphBlt(
     unsigned int,
     CharInfoPtr *,
     pointer
-#endif
 );
 
 /* wm3.c */
 int wm3_set_regs(
-#if NeedFunctionPrototypes
     GC *
-#endif
 );
 
 /* ppcIO.c */
-int xf4bppNeverCalled(
-#if NeedFunctionPrototypes
+void xf4bppNeverCalled(
     void
-#endif
 );
 Bool xf4bppScreenInit(
-#if NeedFunctionPrototypes
     ScreenPtr,
     pointer,
     int,
@@ -653,68 +532,54 @@ Bool xf4bppScreenInit(
     int,
     int,
     int
-#endif
 );
 
 /* mfbfillarc.c */
 void xf4bppPolyFillArc(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xArc *
-#endif
 );
 
 /* mfbzerarc.c */
 void xf4bppZeroPolyArc(
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xArc *
-#endif
 );
 
 /* mfbline.c */
 void xf4bppSegmentSS (
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xSegment *
-#endif
 );
 void xf4bppLineSS (
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     int,
     DDXPointPtr
-#endif
 );
 void xf4bppSegmentSD (
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     xSegment *
-#endif
 );
 void xf4bppLineSD (
-#if NeedFunctionPrototypes
     DrawablePtr,
     GCPtr,
     int,
     int,
     DDXPointPtr
-#endif
 );
 
 /* mfbbres.c */
 void xf4bppBresS(
-#if NeedFunctionPrototypes
 	PixelType *,
 	int,
 	int,
@@ -726,12 +591,10 @@ void xf4bppBresS(
 	int,
 	int,
 	int
-#endif
 );
 
 /* mfbbresd.c */
 void xf4bppBresD(
-#if NeedFunctionPrototypes
 	DrawablePtr,
 	int, int,
 	int *,
@@ -743,60 +606,47 @@ void xf4bppBresD(
 	int, int, int, int, int, int,
 	int, int,
 	int, int
-#endif
 );
 
 /* mfbhrzvert.c */
 void xf4bppHorzS(
-#if NeedFunctionPrototypes
 	PixelType *,
 	int,
 	int,
 	int,
 	int
-#endif
 );
 void xf4bppVertS(
-#if NeedFunctionPrototypes
 	PixelType *,
 	int,
 	int,
 	int,
 	int
-#endif
 );
 
 #ifdef PC98_EGC
 
 /* egc_asm.s */
 unsigned char getbits_x(
-#if NeedFunctionPrototypes
 	int,
 	unsigned int,
 	pointer,
 	unsigned int
-#endif
 );
 void wcopyr(
-#if NeedFunctionPrototypes
 	pointer,
 	pointer,
 	int,
 	pointer
-#endif
 );
 void wcopyl(
-#if NeedFunctionPrototypes
 	pointer,
 	pointer,
 	int,
 	pointer
-#endif
 );
 unsigned long int read8Z(
-#if NeedFunctionPrototypes
 	pointer
-#endif
 );
 
 #endif /* PC98_EGC */