[xserver-commit] xserver/miext/layer Makefile.am,1.2,1.3 layerinit.c,1.7,1.8

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/miext/layer
In directory pdx:/tmp/cvs-serv23831/miext/layer

Modified Files:
	Makefile.am layerinit.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/miext/layer/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	29 Sep 2003 01:42:40 -0000	1.2
+++ Makefile.am	2 Nov 2003 19:56:11 -0000	1.3
@@ -2,6 +2,7 @@
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/shadow		\
+	-I$(top_srcdir)/miext/damage		\
 	-I$(top_srcdir)/render			\
 	$(XSERVER_CFLAGS)
 

Index: layerinit.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/layer/layerinit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- layerinit.c	11 Sep 2003 05:12:51 -0000	1.7
+++ layerinit.c	2 Nov 2003 19:56:11 -0000	1.8
@@ -349,11 +349,13 @@
     pScreen->CloseScreen = pLayScr->kinds[kind].CloseScreen;
     (*pScreen->CloseScreen) (index, pScreen);
     
+#if 0
     /*
      * make sure the shadow layer is cleaned up as well
      */
     if (kind != LAYER_SHADOW)
 	xfree (shadowGetScrPriv (pScreen));
+#endif
 
     xfree (pLayScr->kinds);
     xfree (pLayScr);