xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/xf4bpp/Makefile.am |    2 +-
 hw/xfree86/xf4bpp/ppcCpArea.c |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
diff-tree aff404f293ed86a44a093a51a9f11e79e6c3f4f6 (from 0aaac95b0d12089b256c97f6ff955c8c229ae095)
Author: Adam Jackson <ajax at theobromine.nwnk.net>
Date:   Fri Jul 21 18:24:37 2006 -0400

    Detach xf4bpp from cfb.

diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index 7a9dc3a..7cb4ac2 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -57,6 +57,6 @@ mfbseg.c:
 	echo "#define POLYSEGMENT" > $@
 	echo "#include \"$(srcdir)/mfbline.c\"" >> $@
 
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb
 
 AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index cac588d..2242074 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -55,8 +55,7 @@ SOFTWARE.
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #define PSZ 8
-#include "cfb.h"
-#include "cfbmskbits.h"
+#include "mfb.h"
 #include "mergerop.h"
 #include "mi.h"
 #include "pixmapstr.h"
@@ -87,8 +86,8 @@ vga16DoBitblt
     int w, h;
     int careful;
 
-    widthSrc = cfbGetLongWidth(pSrc);
-    widthDst = cfbGetLongWidth(pDst);
+    widthSrc = mfbGetPixelWidth(pSrc);
+    widthDst = mfbGetPixelWidth(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.