XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 21 insertions, 13 deletions

diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
index 5db5c1f01..60a012c28 100644
--- a/cfb/cfbglblt8.c
+++ b/cfb/cfbglblt8.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */
 
 /*
  * Poly glyph blt.  Accepts an arbitrary font <= 32 bits wide, in Copy mode
@@ -87,7 +87,14 @@ typedef CARD32	*glyphPointer;
 
 #endif
 
-static void cfbPolyGlyphBlt8Clipped();
+static void cfbPolyGlyphBlt8Clipped(
+    DrawablePtr pDrawable,
+    GCPtr	pGC,
+    int 	x,
+    int         y,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,		/* array of character info */
+    unsigned char *pglyphBase); /* start of array of glyphs */
 
 #if defined(HAS_STIPPLE_CODE) && !defined(GLYPHROP) && !defined(USE_LEFTBITS)
 #define USE_STIPPLE_CODE
@@ -267,13 +274,14 @@ cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 }
 
 static void
-cfbPolyGlyphBlt8Clipped (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
-    DrawablePtr pDrawable;
-    GCPtr	pGC;
-    int 	x, y;
-    unsigned int nglyph;
-    CharInfoPtr *ppci;		/* array of character info */
-    unsigned char *pglyphBase;	/* start of array of glyphs */
+cfbPolyGlyphBlt8Clipped(
+    DrawablePtr pDrawable,
+    GCPtr	pGC,
+    int 	x,
+    int         y,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,		/* array of character info */
+    unsigned char *pglyphBase)	/* start of array of glyphs */
 {
 #ifndef GLYPHROP
     register CfbBits	pixel;
@@ -283,7 +291,7 @@ cfbPolyGlyphBlt8Clipped (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 #endif
     register glyphPointer   glyphBits;
     register int	xoff;
-#if defined(USE_LEFT_BITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
+#if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
     register CfbBits	*dst;
 #endif
 
@@ -291,7 +299,7 @@ cfbPolyGlyphBlt8Clipped (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
     FontPtr		pfont = pGC->font;
     CfbBits		*dstLine;
     CfbBits		*pdstBase;
-#ifdef USE_LEFT_BITS
+#ifdef USE_LEFTBITS
     CARD32		*cTmp;
 #endif
     CARD32		*clips;
@@ -398,7 +406,7 @@ cfbPolyGlyphBlt8Clipped (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 		    }
 	    	} while (--hTmp);
 	    	break;
-#else /* !USE_LEFT_BITS */
+#else /* !USE_LEFTBITS */
 	    	{
 		    int h;
     
@@ -411,7 +419,7 @@ cfbPolyGlyphBlt8Clipped (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 	    	}
 	    	glyphBits = clips;
 	    	/* fall through */
-#endif /* USE_LEFT_BITS */
+#endif /* USE_LEFTBITS */
 	    case rgnIN:
 #ifdef STIPPLE
 	    	STIPPLE(dstLine,glyphBits,pixel,bwidthDst,hTmp,xoff);