[xorg-commit-diffs] xc/programs/Xserver/miext/layer Imakefile, 1.1.4.2, 1.1.4.3 laymodule.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile laymodule.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/miext/layer/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:41:08 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:17:22 -0000	1.1.4.3
@@ -5,7 +5,7 @@
 #define IHaveModules
 #include <Server.tmpl>
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 #if DoLoadableServer
 XFMODSRC = laymodule.c
 XFMODOBJ = laymodule.o

Index: laymodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/layer/laymodule.c,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/laymodule.c	5 Mar 2004 13:41:08 -0000	1.1.4.1
+++ b/laymodule.c	15 Apr 2004 10:17:22 -0000	1.1.4.2
@@ -43,7 +43,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,