First pass merge of XFree86 4.2.0 import.

5 files changed, 17 insertions, 8 deletions

diff --git a/xc/include/Imakefile b/xc/include/Imakefile
index bb596333c..176f28099 100644
--- a/xc/include/Imakefile
+++ b/xc/include/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
 
 
 
-XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
+XCOMM $XFree86: xc/include/Imakefile,v 3.29 2001/08/27 17:40:56 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags /**/
 
diff --git a/xc/include/bitmaps/Imakefile b/xc/include/bitmaps/Imakefile
index 921b5bbf3..b856ee7d3 100644
--- a/xc/include/bitmaps/Imakefile
+++ b/xc/include/bitmaps/Imakefile
@@ -1,5 +1,9 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
 
+
+
+XCOMM $XFree86: xc/include/bitmaps/Imakefile,v 1.3 2001/08/28 16:48:08 tsi Exp $
+
 HEADERS = \
 	1x1 \
 	2x2 \
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index 104b07eb5..762782a91 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
 
 
 
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.43 2001/08/01 00:44:35 tsi Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.47 2001/12/16 18:19:50 keithp Exp $
 
 #if BuildScreenSaverExt || BuildScreenSaveLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
@@ -21,7 +21,7 @@ XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
 #if BuildXF86DGA || BuildXF86DGALibrary
 XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
 #endif
-#if BuildLBX
+#if BuildLBX || BuildXextLib
 LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
 	     lbxstr.h lbxzlib.h
 #endif
@@ -41,14 +41,19 @@ XINERAMAHEADERS = panoramiXext.h panoramiXproto.h Xinerama.h
 #if BuildRender || BuildXftLibrary
 RENDERHEADERS = render.h renderproto.h
 #endif
-#if BuildRandRLibrary
+#if BuildRandR || BuildRandRLibrary
 RANDRHEADERS = randr.h randrproto.h
 #endif
+#if BuildXTrap || BuildXTrapLibrary
+XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
+	xtraplibp.h xtrapproto.h
+#endif
 
 EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
 	       $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
 	       $(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \
-	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS)
+	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
+	       $(XTRAPHEADERS)
 
 
 
diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h
index 222b41b1d..aa17588c6 100644
--- a/xc/include/extensions/renderproto.h
+++ b/xc/include/extensions/renderproto.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.8 2001/08/01 00:44:35 tsi Exp $
+ * $XFree86: xc/include/extensions/renderproto.h,v 1.9 2001/09/07 16:21:15 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -74,7 +74,7 @@ typedef struct {
     Colormap	colormap;
 } xPictFormInfo;
 
-#define sz_xPictFormInfo    24
+#define sz_xPictFormInfo    28
 
 typedef struct {
     VisualID	visual;
diff --git a/xc/include/fonts/Imakefile b/xc/include/fonts/Imakefile
index 06cb129d5..5525a68de 100644
--- a/xc/include/fonts/Imakefile
+++ b/xc/include/fonts/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
 
 
 
-XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.7 2001/01/17 17:53:26 dawes Exp $
+XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.8 2001/08/27 17:40:57 dawes Exp $
 
     HEADERS = FS.h FSproto.h fsmasks.h