First pass merge of XFree86 4.2.0 import.

38 files changed, 74 insertions, 155 deletions

diff --git a/xc/lib/GL/dri/XF86dri.c b/xc/lib/GL/dri/XF86dri.c
index 6bba02e3a..c4c1565d3 100644
--- a/xc/lib/GL/dri/XF86dri.c
+++ b/xc/lib/GL/dri/XF86dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.11 2000/12/07 20:26:02 dawes Exp $ */
+/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.12 2001/08/27 17:40:57 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/xc/lib/GL/dri/dri_glx.c b/xc/lib/GL/dri/dri_glx.c
index 87ff3edbb..d962e8585 100644
--- a/xc/lib/GL/dri/dri_glx.c
+++ b/xc/lib/GL/dri/dri_glx.c
@@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/lib/GL/dri/dri_glx.c,v 1.9 2001/08/18 02:51:03 dawes Exp $ */
+/* $XFree86: xc/lib/GL/dri/dri_glx.c,v 1.10 2001/08/27 17:40:57 dawes Exp $ */
 
 /*
  * Authors:
diff --git a/xc/lib/GL/dri/dri_tmm.c b/xc/lib/GL/dri/dri_tmm.c
index 9e3c9fa9d..def2f9bcd 100644
--- a/xc/lib/GL/dri/dri_tmm.c
+++ b/xc/lib/GL/dri/dri_tmm.c
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.2 2000/02/23 04:46:34 martin Exp $
+ * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.3 2001/08/27 17:40:57 dawes Exp $
  * 
  *
  * DESCRIPTION
diff --git a/xc/lib/GL/dri/drm/Imakefile b/xc/lib/GL/dri/drm/Imakefile
index 274540f16..6e5ff6860 100644
--- a/xc/lib/GL/dri/drm/Imakefile
+++ b/xc/lib/GL/dri/drm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.16 2001/04/23 19:02:11 alanh Exp $
+XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.18 2001/10/04 18:28:21 alanh Exp $
 
 #if GlxUseBuiltInDRIDriver
 #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
@@ -37,10 +37,6 @@ OS_SUBDIR2 = linux
 OS_SUBDIR = bsd
 OS_SUBDIR2 = linux
 #endif
-#if defined(cygwinArchitecture) && 0	/* XXX FIX ME */
-OS_SUBDIR = cygwin
-OS_SUBDIR2 = cygwin
-#endif
 
 LinkSourceFile(xf86drm.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm)
 
@@ -53,6 +49,7 @@ LinkSourceFile(xf86drmRadeon.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm)
 
 LinkSourceFile(drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
 LinkSourceFile(i810_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
+LinkSourceFile(i830_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
 LinkSourceFile(mga_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
 LinkSourceFile(r128_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
 LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel)
diff --git a/xc/lib/GL/glx/pixel.c b/xc/lib/GL/glx/pixel.c
index 8f771e306..353516b4a 100644
--- a/xc/lib/GL/glx/pixel.c
+++ b/xc/lib/GL/glx/pixel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/glx/pixel.c,v 1.4 2001/03/21 16:04:39 dawes Exp $ */
+/* $XFree86: xc/lib/GL/glx/pixel.c,v 1.5 2001/10/28 03:32:27 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -199,7 +199,6 @@ static void FillBitmap(__GLXcontext *gc, GLint width, GLint height,
 		       GLubyte *destImage)
 {
     GLint rowLength = gc->state.storeUnpack.rowLength;
-    GLint imageHeight = gc->state.storeUnpack.imageHeight;
     GLint alignment = gc->state.storeUnpack.alignment;
     GLint skipPixels = gc->state.storeUnpack.skipPixels;
     GLint skipRows = gc->state.storeUnpack.skipRows;
@@ -277,7 +276,6 @@ void __glFillImage(__GLXcontext *gc, GLint dim, GLint width, GLint height,
 {
     GLint rowLength = gc->state.storeUnpack.rowLength;
     GLint imageHeight = gc->state.storeUnpack.imageHeight;
-    GLint imageDepth = gc->state.storeUnpack.imageDepth;
     GLint alignment = gc->state.storeUnpack.alignment;
     GLint skipPixels = gc->state.storeUnpack.skipPixels;
     GLint skipRows = gc->state.storeUnpack.skipRows;
@@ -507,13 +505,12 @@ void __glEmptyImage(__GLXcontext *gc, GLint dim, GLint width, GLint height,
 {
     GLint rowLength = gc->state.storePack.rowLength;
     GLint imageHeight = gc->state.storePack.imageHeight;
-    GLint imageDepth = gc->state.storePack.imageDepth;
     GLint alignment = gc->state.storePack.alignment;
     GLint skipPixels = gc->state.storePack.skipPixels;
     GLint skipRows = gc->state.storePack.skipRows;
     GLint skipImages = gc->state.storePack.skipImages;
     GLint components, elementSize, rowSize, padding, groupsPerRow, groupSize;
-    GLint elementsPerRow, sourceRowSize, sourcePadding, g, h, i;
+    GLint elementsPerRow, sourceRowSize, sourcePadding, h, i;
     GLint imageSize, rowsPerImage;
     GLubyte *start, *iter, *itera;
 
diff --git a/xc/lib/GL/glx/xfont.c b/xc/lib/GL/glx/xfont.c
index 142aa386f..14be02f44 100644
--- a/xc/lib/GL/glx/xfont.c
+++ b/xc/lib/GL/glx/xfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/glx/xfont.c,v 1.6 2001/05/02 15:06:02 dawes Exp $ */
+/* $XFree86: xc/lib/GL/glx/xfont.c,v 1.7 2001/10/28 03:32:27 tsi Exp $ */
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
@@ -171,7 +171,7 @@ fill_bitmap (Display *dpy, Window win, GC gc,
 static XCharStruct *isvalid(XFontStruct *fs, int which)
 {
   unsigned int  rows,pages;
-  int           byte1,byte2;
+  int           byte1 = 0, byte2 = 0;
   int           i,valid = 1;
 
   rows = fs->max_byte1 - fs->min_byte1 + 1;
diff --git a/xc/lib/GL/mesa/dri/dri_mesa.c b/xc/lib/GL/mesa/dri/dri_mesa.c
index 97aa909f9..2bf27903c 100644
--- a/xc/lib/GL/mesa/dri/dri_mesa.c
+++ b/xc/lib/GL/mesa/dri/dri_mesa.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.16 2001/04/10 16:07:49 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.17 2001/08/27 17:40:57 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/xc/lib/GL/mesa/src/drv/common/hwlog.h b/xc/lib/GL/mesa/src/drv/common/hwlog.h
index 8df6d0189..6c5a18555 100644
--- a/xc/lib/GL/mesa/src/drv/common/hwlog.h
+++ b/xc/lib/GL/mesa/src/drv/common/hwlog.h
@@ -24,7 +24,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.3 2000/11/18 19:37:05 tsi Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.5 2001/10/31 23:22:57 tsi Exp $ */
  
 /* Usage:
  * - use mgaError for error messages. Always write to X error and log file.
@@ -57,15 +57,15 @@ extern hwlog_t hwlog;
 
 /* open and close log file. */
 int  hwOpenLog(const char *filename, char *prefix);
-void hwCloseLog();
+void hwCloseLog(void);
 
 /* return 1 if log file is succesfully opened */
-int  hwIsLogReady();
+int  hwIsLogReady(void);
 
 /* set current log level to 'level'. Messages with level less than or equal
    the current log level will be written to the log file. */
 void hwSetLogLevel(int level);
-int  hwGetLogLevel();
+int  hwGetLogLevel(void);
 
 /* hwLog and hwLogv write a message to the log file.	*/
 /* do not call these directly, use hwMsg() instead	*/
@@ -82,11 +82,11 @@ void hwMsg(int level, const char *format, ...);
 
 
 static __inline__ int hwOpenLog(const char *f, char *prefix) { hwlog.prefix=prefix; return -1; }
-static __inline__ int hwIsLogReady( void ) { return 0; }
-static __inline__ int hwGetLogLevel( void ) { return -1; }
-static __inline__ int hwLogLevel(int level) { return 0; }
-static void hwLog(int level, const char *format, ...) {}
-static void hwMsg(int level, const char *format, ...) {}
+#define hwIsLogReady() (0)
+#define hwGetLogLevel() (-1)
+#define hwLogLevel(n) (0)
+#define hwLog()
+#define hwMsg()
 
 #define hwCloseLog()
 #define hwSetLogLevel(x)
diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c
index 6fa6a4ae2..9053a58d0 100644
--- a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c
+++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c,v 1.2 2000/09/24 13:51:03 alanh Exp $
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c,v 1.3 2001/11/08 04:00:12 tsi Exp $
  *
  * GLX Hardware Device Driver for Sun Creator/Creator3D
  * Copyright (C) 2000 David S. Miller
@@ -180,9 +180,11 @@ void ffbDDCheckPartialRasterSetup(GLcontext *ctx, struct gl_pipeline_stage *d)
 
 void ffbDDPartialRasterSetup(struct vertex_buffer *VB)
 {
+#if 0
 	ffbContextPtr fmesa = FFB_CONTEXT(VB->ctx);
 	GLuint new = VB->pipeline->new_outputs;
 	GLuint available = VB->pipeline->outputs;
+#endif
 	GLuint ind = 0;
 
 #if 1
diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
index 459dd3a19..2e056e1d9 100644
--- a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
+++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.3 2000/06/17 00:02:56 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.4 2001/08/27 17:40:57 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
index 6d0428fb2..c7cf9ac35 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
@@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c,v 1.13 2001/08/18 02:51:04 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c,v 1.14 2001/10/02 11:44:13 alanh Exp $ */
 
 /*
  * Authors:
@@ -155,9 +155,9 @@ GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
 
    /* Check that the DRM driver version is compatible */
    if (sPriv->drmMajor != 1 ||
-       sPriv->drmMinor < 1) {
+       sPriv->drmMinor < 2) {
       char msg[1000];
-      sprintf(msg, "i810 DRI driver expected DRM driver version 1.1 or greater but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      sprintf(msg, "i810 DRI driver expected DRM driver version 1.2 or greater but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
       __driMesaMessage(msg);
       return GL_FALSE;
    }
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810context.h b/xc/lib/GL/mesa/src/drv/i810/i810context.h
index 17882b3be..0ac05df68 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810context.h
+++ b/xc/lib/GL/mesa/src/drv/i810/i810context.h
@@ -21,7 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810context.h,v 1.5 2000/08/28 02:43:11 tsi Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810context.h,v 1.6 2001/08/27 21:12:19 dawes Exp $ */
 
 #ifndef I810CONTEXT_INC
 #define I810CONTEXT_INC
@@ -202,13 +202,4 @@ extern int I810_DEBUG;
 #define DEBUG_VERBOSE_IOCTL  0x4000
 
 
-
-extern GLuint i810DDRegisterPipelineStages( struct gl_pipeline_stage *out,
-					   const struct gl_pipeline_stage *in,
-					   GLuint nr );
-
-extern GLboolean i810DDBuildPrecalcPipeline( GLcontext *ctx );
-
-
-
 #endif
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c b/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c
index df62cb664..459c9e6f0 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c
@@ -21,7 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810fastpath.c,v 1.5 2000/11/13 23:31:27 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810fastpath.c,v 1.6 2001/08/27 21:12:19 dawes Exp $ */
 
 #include <stdio.h>
 
@@ -37,12 +37,9 @@
 #include "i810tris.h"
 #include "i810state.h"
 #include "i810vb.h"
+#include "vbcull.h"
 
 
-extern void i810DDResizeVB( struct vertex_buffer *VB, GLuint size );
-
-extern void gl_fast_copy_vb( struct vertex_buffer *VB );
-  
 struct i810_fast_tab {
    void (*build_vertices)( struct vertex_buffer *VB, GLuint do_cliptest );
    void (*interp)( GLfloat t, GLfloat *O, const GLfloat *I, const GLfloat *J );
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810tex.c b/xc/lib/GL/mesa/src/drv/i810/i810tex.c
index ff537aece..e7634ec00 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810tex.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810tex.c
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810tex.c,v 1.7 2001/10/31 22:50:24 tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -363,7 +364,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
    {
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
-      i810Msg(10,"  CopyRGB: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -378,7 +378,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
    {
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
-      i810Msg(10,"  CopyRGBA: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -393,7 +392,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
    {
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
-      i810Msg(10,"  CopyL: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -409,7 +407,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
       int i;
-      i810Msg(10,"  CopyI: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -424,7 +421,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
    {
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
-      i810Msg(10,"  CopyLA: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -439,7 +435,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
    {
       GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
       GLubyte  *src = (GLubyte *)image->Data;
-      i810Msg(10,"  CopyA: %p %p\n", dst, src);      
 
       for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
 	 for (i = 0 ; i < image->Width ; i++) {
@@ -456,7 +451,6 @@ static void i810UploadTexLevel( i810TextureObjectPtr t, int level )
       {
 	 GLubyte *dst = (GLubyte *)(t->BufAddr + t->image[level].offset);
 	 GLubyte *src = (GLubyte *)image->Data;
-	 i810Msg(10,"  CopyIndex: %p %p\n", dst, src);      
 
 	 for (j = 0 ; j < image->Height ; j++, dst += t->Pitch) {
 	    for (i = 0 ; i < image->Width ; i++) {
@@ -1304,9 +1298,6 @@ static void i810TexImage( GLcontext *ctx,
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    i810TextureObjectPtr t;
 
-   i810Msg(10,"i810TexImage(%d): level %d internalFormat %x\n", 
-	   tObj->Name, level, internalFormat);
-
    if (target != GL_TEXTURE_2D)
       return;
 
@@ -1332,10 +1323,6 @@ static void i810TexSubImage( GLcontext *ctx, GLenum target,
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    i810TextureObjectPtr t;
-   i810Msg(10,"i810TexSubImage():\n");
-   i810Msg(10,"  Size: %d,%d of %d,%d; Level %d\n",
-	   width, height, image->Width,image->Height,
-	   level);
 
    if ( target != GL_TEXTURE_2D ) 
       return;
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c
index 731afb75a..236ca59c5 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c
@@ -24,7 +24,7 @@
  * Authors:
  *    Keith Whitwell <keithw@valinux.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.c,v 1.7 2001/04/10 16:07:50 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.c,v 1.8 2001/10/31 22:50:24 tsi Exp $ */
 
 #include <stdio.h>
 #include "mgacontext.h"
@@ -131,7 +131,6 @@ static void mgaUpdateRectsFromSarea( mgaContextPtr mmesa )
 
    mmesa->dirty_cliprects = (MGA_FRONT|MGA_BACK) & ~(sarea->exported_buffers);
 }
-#endif
 
 
 static void printSareaRects( mgaContextPtr mmesa )
@@ -200,7 +199,7 @@ static void printMmesaRects( mgaContextPtr mmesa )
 	   driDrawable->index,
 	   driScreen->pSAREA->drawableTable[driDrawable->index].stamp);
 }
-
+#endif
 
 
 void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers )
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c b/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c
index 0eac06f68..30e840ef3 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c
@@ -24,7 +24,7 @@
  * Authors:
  *    Keith Whitwell <keithw@valinux.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgafastpath.c,v 1.8 2001/04/10 16:07:50 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgafastpath.c,v 1.9 2001/08/27 21:12:19 dawes Exp $ */
 
 #include <stdio.h>
 
@@ -39,12 +39,9 @@
 #include "mgatris.h"
 #include "mgastate.h"
 #include "mgavb.h"
+#include "vbcull.h"
 
 
-extern void mgaDDResizeVB( struct vertex_buffer *VB, GLuint size );
-
-extern void gl_fast_copy_vb( struct vertex_buffer *VB );
-
 struct mga_fast_tab {
    void (*build_vertices)( struct vertex_buffer *VB, GLuint do_cliptest );
    void (*interp)( GLfloat t, GLfloat *O, const GLfloat *I, const GLfloat *J );
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c
index b07e69271..d5524c372 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c
@@ -25,7 +25,7 @@
  *    Keith Whitwell <keithw@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgaioctl.c,v 1.11 2001/04/10 16:07:50 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgaioctl.c,v 1.12 2001/10/31 22:50:24 tsi Exp $ */
 
 #include <stdio.h>
 
@@ -296,8 +296,8 @@ void mgaSwapBuffers( mgaContextPtr mmesa )
 	 wait++;
 	 fprintf( stderr, "   last: head=0x%06x wrap=%d\n",
 		  last_frame, last_wrap );
-	 fprintf( stderr, "   head: head=0x%06x wrap=%d\n",
-		  MGA_READ( MGAREG_PRIMADDRESS ) - mmesa->primary_offset,
+	 fprintf( stderr, "   head: head=0x%06lx wrap=%d\n",
+		  (long)(MGA_READ( MGAREG_PRIMADDRESS ) - mmesa->primary_offset),
 		  mmesa->sarea->last_wrap );
       }
       UPDATE_LOCK( mmesa, DRM_LOCK_FLUSH );
diff --git a/xc/lib/GL/mesa/src/drv/mga/mgavb.c b/xc/lib/GL/mesa/src/drv/mga/mgavb.c
index 90020f178..574bf82d7 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgavb.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgavb.c
@@ -24,7 +24,7 @@
  * Authors:
  *    Keith Whitwell <keithw@valinux.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgavb.c,v 1.10 2001/04/10 16:07:51 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgavb.c,v 1.11 2001/10/31 22:50:24 tsi Exp $ */
 
 #include "mgacontext.h"
 #include "mgavb.h"
@@ -406,7 +406,7 @@ void mgaDDPartialRasterSetup( struct vertex_buffer *VB )
 void mgaDDDoRasterSetup( struct vertex_buffer *VB )
 {
    GLcontext *ctx = VB->ctx;
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
+/*     mgaContextPtr mmesa = MGA_CONTEXT( ctx ); */
 
    /* Can't lock, won't lock
     */
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_context.h b/xc/lib/GL/mesa/src/drv/r128/r128_context.h
index 800cc1754..c23b5848b 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_context.h
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_context.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.h,v 1.8 2001/04/10 17:53:07 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.h,v 1.9 2001/10/02 11:44:13 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -266,12 +266,7 @@ extern r128ContextPtr r128MakeCurrent( r128ContextPtr oldCtx,
 #else
 #include <byteswap.h>
 #define LE32_OUT( x, y )	do { x = bswap_32( y ); } while (0)
-#define LE32_OUT_FLOAT( x, y )						\
-do {									\
-   GLuint __tmp;							\
-   *(GLfloat *)&__tmp = y;						\
-   x = bswap_32( __tmp );						\
-} while (0)
+#define LE32_OUT_FLOAT( x, y )	do { x = bswap_32( *(unsigned int *)&y ); } while (0)
 #endif
 
 /* ================================================================
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
index 09dbb390d..a82cfe8c2 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.6 2001/04/10 16:07:52 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.7 2001/10/31 22:50:25 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -318,8 +318,8 @@ static int r128WaitForFrameCompletion( r128ContextPtr rmesa )
 #endif
 
       if ( 0 )
-	 fprintf( stderr, " last=0x%08x frame=0x%08x\n",
-		  rmesa->sarea->last_frame, frame );
+	 fprintf( stderr, " last=0x%08x frame=0x%08lx\n",
+		  rmesa->sarea->last_frame, (long)frame );
 
       if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) {
 	 break;
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
index e7e55b8ca..e65973f5b 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c,v 1.9 2001/08/18 02:51:05 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c,v 1.12 2001/11/26 21:46:35 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -296,9 +296,9 @@ XMesaOpenFullScreen( __DRIcontextPrivate *driContextPriv )
 GLboolean
 XMesaCloseFullScreen( __DRIcontextPrivate *driContextPriv )
 {
+#if 0
    r128ContextPtr rmesa = (r128ContextPtr)driContextPriv->driverPrivate;
 
-#if 0
    LOCK_HARDWARE( rmesa );
    r128WaitForIdleLocked( rmesa );
 
diff --git a/xc/lib/GL/mesa/src/drv/radeon/Imakefile b/xc/lib/GL/mesa/src/drv/radeon/Imakefile
index fa896fc93..dbe9a4bfc 100644
--- a/xc/lib/GL/mesa/src/drv/radeon/Imakefile
+++ b/xc/lib/GL/mesa/src/drv/radeon/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.6 2001/05/10 16:56:11 dawes Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.7 2001/11/02 23:29:26 dawes Exp $
 
 #include <Threads.tmpl>
 
@@ -58,7 +58,7 @@ NormalLintTarget($(SRCS))
 
 #if !GlxUseBuiltInDRIDriver
 LIBNAME = radeon_dri.so
-SharedDepModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
 InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 
 #ifdef GlxSoProf
diff --git a/xc/lib/GL/mesa/src/drv/sis/Imakefile b/xc/lib/GL/mesa/src/drv/sis/Imakefile
index d58ed4a30..66c421073 100644
--- a/xc/lib/GL/mesa/src/drv/sis/Imakefile
+++ b/xc/lib/GL/mesa/src/drv/sis/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.17 2001/05/10 16:56:12 dawes Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.18 2001/11/02 23:29:27 dawes Exp $
 
 #include <Threads.tmpl>
 
@@ -64,7 +64,7 @@ NormalLintTarget($(SRCS))
 
 #if !GlxUseBuiltInDRIDriver
 LIBNAME = sis_dri.so
-SharedDepModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
 InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 
 #ifdef GlxSoProf
diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c
index e83a6a0e9..a631000e6 100644
--- a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c
+++ b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c
@@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_mesa.c,v 1.5 2000/09/26 15:56:48 tsi Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_mesa.c,v 1.6 2001/10/31 22:50:25 tsi Exp $ */
 
 /*
  * Authors:
@@ -1045,8 +1045,8 @@ void sis_set_render_pos(GLcontext * ctx, GLubyte *base, GLuint pitch)
   assert (base != NULL);
 
   if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){
-    fprintf(stderr, "set drawing position: base=%x, pitch=%lu\n", 
-            (unsigned long)base, pitch);
+    fprintf(stderr, "set drawing position: base=%lx, pitch=%lu\n", 
+            (long)base, (long)pitch);
   }
 
   /* software render */
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
index 049bd0875..fa532ba36 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c,v 1.3 2001/08/18 02:51:06 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c,v 1.6 2001/12/13 00:34:21 alanh Exp $ */
 
 /*
  * Original rewrite:
@@ -175,7 +175,7 @@ GLboolean tdfxCreateContext( Display *dpy, GLvisual *mesaVis,
       return GL_FALSE;
    }
 
-   fxMesa->Glide.grDRIOpen( sPriv->pFB, fxScreen->regs.map, fxScreen->deviceID,
+   fxMesa->Glide.grDRIOpen( (char*) sPriv->pFB, fxScreen->regs.map, fxScreen->deviceID,
 	      fxScreen->width, fxScreen->height, fxScreen->mem, fxScreen->cpp,
 	      fxScreen->stride, fxScreen->fifoOffset, fxScreen->fifoSize,
 	      fxScreen->fbOffset, fxScreen->backOffset, fxScreen->depthOffset,
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
index f23ac43aa..39069f061 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h,v 1.2 2001/08/18 02:51:06 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h,v 1.3 2001/10/02 11:44:13 alanh Exp $ */
 
 /*
  * Original rewrite:
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c
index ae2aca898..729349a24 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c,v 1.2 2001/08/18 02:51:06 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c,v 1.3 2001/12/13 00:34:21 alanh Exp $ */
 
 /*
  * Original rewrite:
@@ -69,7 +69,7 @@ void tdfxGetLock( tdfxContextPtr fxMesa )
 	 * that state onto the hardware when you set the state.
 	 */
         void *state;
-        FxU32 size;
+        FxI32 size;
         fxMesa->Glide.grGet( GR_GLIDE_STATE_SIZE, 4, &size );
         state = malloc( size );
         FX_grGlideGetState_NoLock( state );
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
index 65db94bbd..d97549f0a 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c,v 1.2 2001/08/18 02:51:07 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c,v 1.3 2001/10/02 11:44:13 alanh Exp $ */
 
 /*
  * Original rewrite:
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
index ed3d9017e..7485f6ea1 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c,v 1.3 2001/08/18 02:51:07 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c,v 1.4 2001/10/02 11:44:13 alanh Exp $ */
 
 /*
  * Original rewrite:
diff --git a/xc/lib/Imakefile b/xc/lib/Imakefile
index 5c8bfc751..8693fafd9 100644
--- a/xc/lib/Imakefile
+++ b/xc/lib/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:00 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/Imakefile,v 3.56 2001/08/13 21:46:46 dawes Exp $
+XCOMM $XFree86: xc/lib/Imakefile,v 3.58 2001/11/02 23:29:26 dawes Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags
@@ -113,6 +113,10 @@ FREETYPE2BUILDDIR = freetype2
 RANDRLIBDIR = Xrandr
 #endif
 
+#if BuildXTrapLibrary
+XTRAPLIBDIR = XTrap
+#endif
+
 XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \
 		$(XF86DGALIBDIR) $(XF86RUSHLIBDIR)
 
@@ -186,7 +190,7 @@ LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(THRSTUBLIBDIR) $(X11LIBDIR) \
 	     $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
 	     $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
 	     $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
-	     $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR)
+	     $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR)
 
 SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
 	  $(FONTCACHELIBDIR)
diff --git a/xc/lib/font/FreeType/Imakefile b/xc/lib/font/FreeType/Imakefile
index 953c6ff0d..8a61563a7 100644
--- a/xc/lib/font/FreeType/Imakefile
+++ b/xc/lib/font/FreeType/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.16 2000/09/19 12:46:06 eich Exp $
+XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.17 2001/08/27 17:40:58 dawes Exp $
 
 XCOMM Imakefile created for the Freetype TrueType renderer.
 XCOMM Mark Leisher <mleisher@crl.nmsu.edu>
diff --git a/xc/lib/font/Imakefile b/xc/lib/font/Imakefile
index e48028420..234477d54 100644
--- a/xc/lib/font/Imakefile
+++ b/xc/lib/font/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/font/Imakefile,v 3.32 2001/01/17 19:43:16 dawes Exp $
+XCOMM $XFree86: xc/lib/font/Imakefile,v 3.33 2001/08/27 17:40:58 dawes Exp $
 
 #include <Server.tmpl>
 
diff --git a/xc/lib/font/Speedo/Imakefile b/xc/lib/font/Speedo/Imakefile
index e2d9dcdeb..a4865cc77 100644
--- a/xc/lib/font/Speedo/Imakefile
+++ b/xc/lib/font/Speedo/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.10 2001/01/19 08:13:29 dawes Exp $
+XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.11 2001/08/27 17:40:58 dawes Exp $
 
 #if BuildServer && DoLoadableServer
 #define IHaveSubdirs
diff --git a/xc/lib/font/Type1/Imakefile b/xc/lib/font/Type1/Imakefile
index f5ea064b1..95f7d061e 100644
--- a/xc/lib/font/Type1/Imakefile
+++ b/xc/lib/font/Type1/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:28 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.10 2001/01/17 19:43:21 dawes Exp $
+XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.11 2001/08/27 17:40:58 dawes Exp $
 
 #if BuildServer && DoLoadableServer
 #define IHaveSubdirs
diff --git a/xc/lib/font/X-TrueType/Imakefile b/xc/lib/font/X-TrueType/Imakefile
index 651ecf0e7..3a8536e6b 100644
--- a/xc/lib/font/X-TrueType/Imakefile
+++ b/xc/lib/font/X-TrueType/Imakefile
@@ -1,5 +1,5 @@
 XCOMM X-TrueType Server - TrueType rasterizer for X
-XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.7 2000/11/28 19:09:30 dawes Exp $
+XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.8 2001/08/27 17:40:58 dawes Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
diff --git a/xc/lib/font/bitmap/Imakefile b/xc/lib/font/bitmap/Imakefile
index f69bd467a..5915d57a6 100644
--- a/xc/lib/font/bitmap/Imakefile
+++ b/xc/lib/font/bitmap/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:34 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.11 2001/04/03 17:51:59 paulo Exp $
+XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.13 2002/01/18 16:27:19 keithp Exp $
 
 #if BuildServer && DoLoadableServer
 #define IHaveSubdirs
@@ -12,9 +12,9 @@ XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.11 2001/04/03 17:51:59 paulo Ex
 SUBDIRS = module
 #endif
 
-#ifndef KDriveXServer
 BDFSRCS=bdfread.c bdfutils.c
 BDFOBJS=bdfread.o bdfutils.o
+#ifndef KDriveXServer
 BDFDEFS=-DBDFFORMAT
 
 SNFSRCS=snfread.c
diff --git a/xc/lib/xkbfile/Imakefile b/xc/lib/xkbfile/Imakefile
index 7577296cd..d67324ee6 100644
--- a/xc/lib/xkbfile/Imakefile
+++ b/xc/lib/xkbfile/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:42 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.3 2001/01/17 19:43:39 dawes Exp $
+XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.4 2001/08/27 17:40:59 dawes Exp $
 
 #define DoNormalLib	YES
 #define DoSharedLib	NO
diff --git a/xc/lib/zlib/z-def.cpp b/xc/lib/zlib/z-def.cpp
deleted file mode 100644
index eeae2c8d2..000000000
--- a/xc/lib/zlib/z-def.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifdef __CYGWIN__
-LIBRARY ZLIB
-EXPORTS
-	adler32 @ 1 ;
-	compress @ 2 ;
-	compress2 @ 3 ;
-	crc32 @ 4 ;
-	deflate @ 5 ;
-	deflateCopy @ 6 ;
-	deflateEnd @ 7 ;
-	deflateInit2_ @ 8 ;
-	deflateInit_ @ 9 ;
-	deflateParams @ 10 ;
-	deflateReset @ 11 ;
-	deflateSetDictionary @ 12 ;
-	get_crc_table @ 13 ;
-	gzclose @ 14 ;
-	gzdopen @ 15 ;
-	gzeof @ 16 ;
-	gzerror @ 17 ;
-	gzflush @ 18 ;
-	gzgetc @ 19 ;
-;	gzgets @ 20 ;
-	gzopen @ 21 ;
-	gzprintf @ 22 ;
-	gzputc @ 23 ;
-;	gzputs @ 24 ;
-	gzread @ 25 ;
-	gzrewind @ 26 ;
-	gzseek @ 27 ;
-	gzsetparams @ 28 ;
-	gztell @ 29 ;
-	gzwrite @ 30 ;
-	inflate @ 31 ;
-	inflateEnd @ 32 ;
-	inflateInit2_ @ 33 ;
-	inflateInit_ @ 34 ;
-	inflateReset @ 35 ;
-	inflateSetDictionary @ 36 ;
-	inflateSync @ 37 ;
-	inflateSyncPoint @ 38 ;
-	uncompress @ 39 ;
-	zError @ 40 ;
-	zlibVersion @ 41 ;
-#endif
-
-/* $XFree86: xc/lib/zlib/z-def.cpp,v 1.1 2000/08/09 23:40:16 dawes Exp $ */