3 files changed, 38 insertions, 13 deletions
diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 677f28af0..1280a780c 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -301,24 +301,14 @@ fbPixmapToRegion(PixmapPtr pPix)
 
 #ifdef FB_DEBUG
 
-#ifndef WIN32
 #include <stdio.h>
-#else
-#include <dbg.h>
-#endif
 
 static Bool
 fbValidateBits(FbStip * bits, int stride, FbStip data)
 {
     while (stride--) {
         if (*bits != data) {
-#ifdef WIN32
-            NCD_DEBUG((DEBUG_FAILURE,
-                       "fdValidateBits failed at 0x%x (is 0x%x want 0x%x)",
-                       bits, *bits, data));
-#else
-            fprintf(stderr, "fbValidateBits failed\n");
-#endif
+            fprintf (stderr, "fbValidateBits failed at 0x%x (is 0x%x want 0x%x)\n",bits, *bits, data);
             return FALSE;
         }
         bits++;
diff --git a/xorg-server/fb/makefile b/xorg-server/fb/makefile
new file mode 100644
index 000000000..717c07332
--- /dev/null
+++ b/xorg-server/fb/makefile
@@ -0,0 +1,37 @@
+
+LIBRARY=libfb
+
+CCFLAGS:=$(CCFLAGS:-RTCc=)
+
+
+CSRCS = 	\
+	fb24_32.c	\
+	fballpriv.c	\
+	fbarc.c		\
+	fbbits.c	\
+	fbblt.c		\
+	fbbltone.c	\
+	fbcopy.c	\
+	fbfill.c	\
+	fbfillrect.c	\
+	fbfillsp.c	\
+	fbgc.c		\
+	fbgetsp.c	\
+	fbglyph.c	\
+	fbimage.c	\
+	fbline.c	\
+	fboverlay.c	\
+	fbpict.c	\
+	fbpixmap.c	\
+	fbpoint.c	\
+	fbpush.c	\
+	fbscreen.c	\
+	fbseg.c		\
+	fbsetsp.c	\
+	fbsolid.c	\
+	fbstipple.c	\
+	fbtile.c	\
+	fbtrap.c	\
+	fbutil.c	\
+	fbwindow.c \
+	fbcmap_mi.c
diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h
index 54d00d003..94efd03dd 100644
--- a/xorg-server/fb/wfbrename.h
+++ b/xorg-server/fb/wfbrename.h
@@ -44,7 +44,6 @@
 #define fbCopyNto1 wfbCopyNto1
 #define fbCopyNtoN wfbCopyNtoN
 #define fbCopyPlane wfbCopyPlane
-#define fbCopyRegion wfbCopyRegion
 #define fbCopyWindow wfbCopyWindow
 #define fbCopyWindowProc wfbCopyWindowProc
 #define fbCreateDefColormap wfbCreateDefColormap
@@ -55,7 +54,6 @@
 #define fbDestroyGlyphCache wfbDestroyGlyphCache
 #define fbDestroyPixmap wfbDestroyPixmap
 #define fbDestroyWindow wfbDestroyWindow
-#define fbDoCopy wfbDoCopy
 #define fbDots wfbDots
 #define fbDots16 wfbDots16
 #define fbDots24 wfbDots24