[xorg-commit-diffs] xc/programs/Xserver/mi Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

Roland Mainz xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:05:46 PDT 2004


Committed by: gisburn

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

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

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:48:27 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:35 -0000	1.1.4.2.6.1.6.1
@@ -41,7 +41,7 @@
 	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \
 	micmap.o mioverlay.o
 
-#ifdef XFree86Version
+#if (defined (XFree86Version) || defined(XorgVersion))
 /* 
  * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o 
  * used by Xnest, Xvfb 




More information about the xorg-commit-diffs mailing list