3 files changed, 16 insertions, 8 deletions
diff --git a/xorg-server/afb/afb.h b/xorg-server/afb/afb.h
index 6731d9557..4b8185f42 100644
--- a/xorg-server/afb/afb.h
+++ b/xorg-server/afb/afb.h
@@ -627,7 +627,7 @@ extern void afbOpaqueStippleAreaPPWCopy(
 	BoxPtr /*pbox*/,
 	int /*alu*/,
 	PixmapPtr /*ptile*/,
-	unsigned char */*rropsOS*/,
+	unsigned char * /*rropsOS*/,
 	unsigned long /*planemask*/
 );
 /* afbtileG.c */
@@ -638,7 +638,7 @@ extern void afbOpaqueStippleAreaPPWGeneral(
 	BoxPtr /*pbox*/,
 	int /*alu*/,
 	PixmapPtr /*ptile*/,
-	unsigned char */*rropsOS*/,
+	unsigned char * /*rropsOS*/,
 	unsigned long /*planemask*/
 );
 
@@ -650,7 +650,7 @@ extern void afbOpaqueStippleAreaCopy(
 	PixmapPtr /*ptile*/,
 	int /*xOff*/,
 	int /*yOff*/,
-	unsigned char */*rropsOS*/,
+	unsigned char * /*rropsOS*/,
 	unsigned long /*planemask*/
 );
 /* afbtileG.c */
@@ -663,7 +663,7 @@ extern void afbOpaqueStippleAreaGeneral(
 	PixmapPtr /*ptile*/,
 	int /*xOff*/,
 	int /*yOff*/,
-	unsigned char */*rropsOS*/,
+	unsigned char * /*rropsOS*/,
 	unsigned long /*planemask*/
 );
 
diff --git a/xorg-server/afb/afbply1rct.c b/xorg-server/afb/afbply1rct.c
index e9d4d5e09..65002c967 100644
--- a/xorg-server/afb/afbply1rct.c
+++ b/xorg-server/afb/afbply1rct.c
@@ -51,14 +51,14 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #if IMAGE_BYTE_ORDER == MSBFirst
-#define intToCoord(i,x,y)	(((x) = GetHighWord(i)), ((y) = (int)((short) (i))))
+#define intToCoord(i,x,y)	(((x) = GetHighWord(i)), ((y) = (int)((short) ((i)&0xffff))))
 #define coordToInt(x,y)		(((x) << 16) | (y))
 #define intToX(i)				(GetHighWord(i))
-#define intToY(i)				((int)((short) i))
+#define intToY(i)				((int)((short) ((i)&0xffff)))
 #else
-#define intToCoord(i,x,y)	(((x) = (int)((short) (i))), ((y) = GetHighWord(i)))
+#define intToCoord(i,x,y)	(((x) = (int)((short) ((i)&0xffff))), ((y) = GetHighWord(i)))
 #define coordToInt(x,y)		(((y) << 16) | (x))
-#define intToX(i)				((int)((short) (i)))
+#define intToX(i)				((int)((short) ((i)&0xffff)))
 #define intToY(i)				(GetHighWord(i))
 #endif
 
diff --git a/xorg-server/afb/makefile b/xorg-server/afb/makefile
new file mode 100644
index 000000000..862f25431
--- /dev/null
+++ b/xorg-server/afb/makefile
@@ -0,0 +1,8 @@
+CSRCS=afbbitblt.c afbbltC.c afbbltCI.c afbbltG.c afbbltO.c afbbltX.c afbbres.c afbbresd.c afbclip.c \
+      afbcmap.c afbfillarc.c afbfillrct.c afbfillsp.c afbfont.c afbgc.c afbgetsp.c afbhrzvert.c afbimage.c afbimggblt.c \
+      afbmisc.c afbpixmap.c afbply1rct.c afbplygblt.c afbpntarea.c afbpolypnt.c afbpushpxl.c afbscrinit.c afbseg.c \
+      afbsetsp.c afbtegblt.c afbtileC.c afbtileG.c afbwindow.c afbzerarc.c
+#afbtile.c afbline.c afbblt.c
+
+LIBRARY=libafb
+