[xorg-commit-diffs] xc/programs/Xserver/afb Imakefile, 1.1.4.1, 1.1.4.2 afbmodule.c, 1.1, 1.1.4.1

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/afb
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/afb

Modified Files:
      Tag: XORG-CURRENT
	Imakefile afbmodule.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/afb/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	5 Mar 2004 13:39:54 -0000	1.1.4.1
+++ b/Imakefile	15 Apr 2004 10:15:44 -0000	1.1.4.2
@@ -3,7 +3,7 @@
 #define IHaveModules
 #include <Server.tmpl>
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 #if DoLoadableServer
 MODSRC = afbmodule.c
 MODOBJ = afbmodule.o

Index: afbmodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/afb/afbmodule.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/afbmodule.c	14 Nov 2003 16:48:53 -0000	1.1
+++ b/afbmodule.c	15 Apr 2004 10:15:44 -0000	1.1.4.1
@@ -36,7 +36,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,