[xorg-commit-diffs] xc/programs/Xserver/mi miinitext.c, 1.1.4.5, 1.1.4.6

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	miinitext.c 
Log Message:
- backing out XFIXES and DAMAGE related code that accidentally went in here.


Index: miinitext.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/miinitext.c	25 Mar 2004 03:30:20 -0000	1.1.4.5
+++ b/miinitext.c	30 Mar 2004 14:14:31 -0000	1.1.4.6
@@ -238,12 +238,6 @@
 #ifdef RES
 extern void ResExtensionInit(INITARGS);
 #endif
-#ifdef DAMAGE
-extern void DamageExtensionInit(INITARGS);
-#endif
-#ifdef XFIXES
-extern void XFixesExtensionInit(INITARGS);
-#endif
 
 #ifndef XFree86LOADER
 
@@ -383,12 +377,6 @@
 #ifdef RES
     ResExtensionInit();
 #endif
-#ifdef DAMAGE
-    DamageExtensionInit();
-#endif
-#ifdef XFIXES
-    XFixesExtensionInit();
-#endif
 }
 
 void
@@ -460,15 +448,7 @@
     { NULL, "FontCache", NULL, NULL },
     { NULL, "RENDER", NULL, NULL },
     { NULL, "RANDR", NULL, NULL },
-#ifdef RES
     { NULL, "X-Resource", NULL, NULL },
-#endif
-#ifdef DAMAGE
-    { NULL, "DAMAGE", NULL, NULL },
-#endif
-#ifdef XFIXES
-    { NULL, "XFIXES", NULL, NULL },
-#endif 
     { NULL, NULL, NULL, NULL }
 };
 #endif