[xorg-commit-diffs] xc/programs/Xserver/mi miinitext.c, 1.1.4.4, 1.1.4.4.2.1

[Stuart Kreitman]

Committed by: stukreit

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

Modified Files:
      Tag: DAMAGE-XFIXES
	miinitext.c 
Log Message:
integration from modular tree.
Modified Files:
  Tag: DAMAGE-XFIXES
 	miinitext.c 


Index: miinitext.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.4.2.1
diff -u -d -r1.1.4.4 -r1.1.4.4.2.1
--- a/miinitext.c	5 Mar 2004 13:41:08 -0000	1.1.4.4
+++ b/miinitext.c	30 Mar 2004 18:44:05 -0000	1.1.4.4.2.1
@@ -377,6 +377,15 @@
 #ifdef RES
     ResExtensionInit();
 #endif
+<<<<<<< miinitext.c
+#ifdef XFIXES
+    XFixesExtensionInit();
+#endif
+#ifdef DAMAGE
+    DamageExtensionInit();
+#endif
+=======
+>>>>>>> 1.1.4.4
 }
 
 void
@@ -454,7 +463,7 @@
 #endif
 
 /* List of built-in (statically linked) extensions */
-static ExtensionModule staticExtensions[] = {
+/*SKKKKKKK  static*/ ExtensionModule staticExtensions[] = {
 #ifdef BEZIER
     { BezierExtensionInit, "BEZIER", NULL, NULL, NULL },
 #endif
@@ -500,6 +509,12 @@
 #ifdef RANDR
     { RRExtensionInit, "RANDR", NULL, NULL, NULL },
 #endif
+#ifdef DAMAGE
+    { DamageExtensionInit, "DAMAGE", NULL, NULL },
+#endif
+#ifdef XFIXES
+    { XFixesExtensionInit, "XFIXES", NULL, NULL },
+#endif 
     { NULL, NULL, NULL, NULL, NULL }
 };