merge XFree86 4.3.0.1 to -CURRENT

2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
--- a/mfb/mfbtile.c
+++ b/mfb/mfbtile.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************

@@ -219,7 +220,7 @@ mfbTileAreaPPW (pDraw, nbox, pbox, alu, ptile)
    int alu;
    PixmapPtr ptile;
 {
-    void    (*f)(), mfbTileAreaPPWCopy(), mfbTileAreaPPWGeneral();
+    void    (*f)();
    
    if (alu == GXcopy)
 	f = mfbTileAreaPPWCopy;