[xorg-commit-diffs] xc/programs/Xserver/cfb Imakefile.inc, 1.1.4.2.4.1, 1.1.4.2.4.1.6.1 cfbmodule.c, 1.1, 1.1.20.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/cfb
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/cfb

Modified Files:
      Tag: XPRINT
	Imakefile.inc cfbmodule.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile.inc
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/Imakefile.inc,v
retrieving revision 1.1.4.2.4.1
retrieving revision 1.1.4.2.4.1.6.1
diff -u -d -r1.1.4.2.4.1 -r1.1.4.2.4.1.6.1
--- a/Imakefile.inc	4 Mar 2004 17:47:25 -0000	1.1.4.2.4.1
+++ b/Imakefile.inc	10 Apr 2004 09:04:17 -0000	1.1.4.2.4.1.6.1
@@ -93,7 +93,7 @@
 	 cfbply1rctC.o cfbply1rctG.o cfbcppl.o $(PSZOBJS) $(STIPPLEOBJ) \
 	 $(XFMODOBJ)
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 PLATFORMDEFS = -DXFREE86
 #endif
 

Index: cfbmodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbmodule.c,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -d -r1.1 -r1.1.20.1
--- a/cfbmodule.c	14 Nov 2003 16:48:53 -0000	1.1
+++ b/cfbmodule.c	10 Apr 2004 09:04:17 -0000	1.1.20.1
@@ -38,7 +38,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,