IA-64 warning fixes

45 files changed, 308 insertions, 229 deletions

diff --git a/extras/Mesa/src/X/xm_api.c b/extras/Mesa/src/X/xm_api.c
index 8524fc914..0d19d000d 100644
--- a/extras/Mesa/src/X/xm_api.c
+++ b/extras/Mesa/src/X/xm_api.c
@@ -21,7 +21,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/X/xm_api.c,v 1.7tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/X/xm_api.c,v 1.8tsi Exp $ */
 
 /*
  * This file contains the implementations of all the XMesa* functions.
@@ -882,6 +882,8 @@ static GLboolean setup_grayscale( int client, XMesaVisual v,
 static GLboolean setup_dithered_color( int client, XMesaVisual v,
                                        XMesaBuffer buffer, XMesaColormap cmap )
 {
+   (void) DitherValues;		/* Muffle compiler */
+
    if (GET_VISUAL_DEPTH(v)<4 || GET_VISUAL_DEPTH(v)>16) {
       return GL_FALSE;
    }
diff --git a/extras/Mesa/src/X86/assyntax.h b/extras/Mesa/src/X86/assyntax.h
index 07532e8f3..ddaeab5c4 100644
--- a/extras/Mesa/src/X86/assyntax.h
+++ b/extras/Mesa/src/X86/assyntax.h
@@ -1,3 +1,4 @@
+/* $XFree86$ */
 
 #ifndef __ASSYNTAX_H__
 #define __ASSYNTAX_H__
diff --git a/extras/Mesa/src/glapitemp.h b/extras/Mesa/src/glapitemp.h
index d5111c175..7aba1c0b2 100644
--- a/extras/Mesa/src/glapitemp.h
+++ b/extras/Mesa/src/glapitemp.h
@@ -1,7 +1,17 @@
+/* $XFree86$ */
 
 /* DO NOT EDIT!  This file is generated by the glapitemp.py script. */
 
 /*
+ * Note directed upstream:
+ *
+ * glapitemp.py doesn't handle GLbitfield's properly.  Until that's corrected,
+ * I'm changing this file directly.
+ *
+ * Marc Aurele La France, tsi@xfree86.org
+ */
+
+/*
  * This file is a template which generates the OpenGL API entry point
  * functions.  It should be included by a .c file which first defines
  * the following macros:
@@ -1065,7 +1075,7 @@ KEYWORD1 void KEYWORD2 NAME(DrawBuffer)(GLenum mode)
 
 KEYWORD1 void KEYWORD2 NAME(Clear)(GLbitfield mask)
 {
-   DISPATCH(Clear, (mask), (F, "glClear(%p);\n", (const void *) mask));
+   DISPATCH(Clear, (mask), (F, "glClear(%x);\n", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
@@ -1145,7 +1155,7 @@ KEYWORD1 void KEYWORD2 NAME(PopAttrib)(void)
 
 KEYWORD1 void KEYWORD2 NAME(PushAttrib)(GLbitfield mask)
 {
-   DISPATCH(PushAttrib, (mask), (F, "glPushAttrib(%p);\n", (const void *) mask));
+   DISPATCH(PushAttrib, (mask), (F, "glPushAttrib(%x);\n", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points)
@@ -1725,7 +1735,7 @@ KEYWORD1 void KEYWORD2 NAME(PopClientAttrib)(void)
 
 KEYWORD1 void KEYWORD2 NAME(PushClientAttrib)(GLbitfield mask)
 {
-   DISPATCH(PushClientAttrib, (mask), (F, "glPushClientAttrib(%p);\n", (const void *) mask));
+   DISPATCH(PushClientAttrib, (mask), (F, "glPushClientAttrib(%x);\n", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
diff --git a/extras/X-TrueType/xttprop.c b/extras/X-TrueType/xttprop.c
index 864d45a73..06bffc668 100644
--- a/extras/X-TrueType/xttprop.c
+++ b/extras/X-TrueType/xttprop.c
@@ -30,7 +30,7 @@
 
 Notice===
 */
-/* $XFree86$ */
+/* $XFree86: xc/extras/X-TrueType/xttprop.c,v 1.5tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -240,6 +240,8 @@ freetype_compute_props(FontInfoPtr pinfo,
         case average_width:
             pp->value = vals->width;
             break;
+	default:
+	    break;
         }
     }
 
diff --git a/extras/expat/lib/internal.h b/extras/expat/lib/internal.h
index 1bf6baa54..e34acb9e5 100644
--- a/extras/expat/lib/internal.h
+++ b/extras/expat/lib/internal.h
@@ -19,8 +19,13 @@
    Note: Use of these macros is based on judgement, not hard rules,
          and therefore subject to change.
 */
+/* $XFree86$ */
+
+#if defined(__GNUC__) && \
+    !defined(ia64) && !defined(__ia64__) && \
+    !defined(__sparc__) && !defined(__sparc_v9__) && !defined(sparc) && \
+    !defined(__sparc64__) && !defined(__arch64__)
 
-#if defined(__GNUC__)
 /* Instability reported with egcs on a RedHat Linux 7.3.
    Let's comment it out:
    #define FASTCALL __attribute__((stdcall, regparm(3)))
@@ -31,6 +36,7 @@
 #define PTRFASTCALL __attribute__((regparm(3)))
 
 #elif defined(WIN32)
+
 /* Using __fastcall seems to have an unexpected negative effect under
    MS VC++, especially for function pointers, so we won't use it for
    now on that platform. It may be reconsidered for a future release
diff --git a/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c b/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
index d38ea2c07..817367c66 100644
--- a/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
+++ b/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c
@@ -38,7 +38,7 @@
  *
  */
 
-/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c,v 1.2 2000/11/02 20:39:06 dawes Exp $ */
+/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c,v 1.3tsi Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -61,7 +61,7 @@
 #pragma weak _XmStrings				= _Xm_Stub_Pointer_
 #pragma weak xmPrimitiveClassRec		= _Xm_Stub_Pointer_
 
-static XtPointer _Xm_Stub_Pointer_ = NULL;
+XtPointer _Xm_Stub_Pointer_ = NULL;
 #endif
 
 void GLwDrawingAreaMakeCurrent (Widget w, GLXContext ctx)
diff --git a/lib/GL/mesa/src/drv/r200/r200_state.c b/lib/GL/mesa/src/drv/r200/r200_state.c
index e01a23c69..e5a69b0b5 100644
--- a/lib/GL/mesa/src/drv/r200/r200_state.c
+++ b/lib/GL/mesa/src/drv/r200/r200_state.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_state.c,v 1.4 2003/02/23 23:59:01 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_state.c,v 1.5tsi Exp $ */
 /*
 Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 
@@ -38,6 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "api_arrayelt.h"
 #include "enums.h"
 #include "colormac.h"
+#include "state.h"
 
 #include "swrast/swrast.h"
 #include "array_cache/acache.h"
diff --git a/lib/GL/mesa/src/drv/sis/sis_alloc.c b/lib/GL/mesa/src/drv/sis/sis_alloc.c
index aa71f269d..a27ead097 100644
--- a/lib/GL/mesa/src/drv/sis/sis_alloc.c
+++ b/lib/GL/mesa/src/drv/sis/sis_alloc.c
@@ -24,7 +24,7 @@ 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_alloc.c,v 1.7 2001/01/08 01:07:29 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c,v 1.8tsi Exp $ */
 
 /*
  * Authors:
@@ -177,7 +177,7 @@ sisAllocZStencilBuffer( sisContextPtr smesa )
    memset( &smesa->zClearPacket, 0, sizeof(ENGPACKET) );
 
    smesa->zClearPacket.dwSrcPitch = (z_depth == 2) ? 0x80000000 : 0xf0000000;
-   smesa->zClearPacket.dwDestBaseAddr = (GLint)(addr -
+   smesa->zClearPacket.dwDestBaseAddr = (unsigned long)(addr -
       (unsigned long)smesa->FbBase);
    smesa->zClearPacket.wDestPitch = width2;
    smesa->zClearPacket.stdwDestPos.wY = 0;
@@ -225,7 +225,7 @@ sisAllocBackbuffer( sisContextPtr smesa )
    addr = (char *)ALIGNMENT( (unsigned long)addr, DRAW_BUFFER_HW_ALIGNMENT );
 
    smesa->backbuffer = addr;
-   smesa->backOffset = (GLint)(addr - (unsigned long)smesa->FbBase);
+   smesa->backOffset = (unsigned long)(addr - (unsigned long)smesa->FbBase);
    smesa->backPitch = width2 * depth;
 
    memset ( &smesa->cbClearPacket, 0, sizeof(ENGPACKET) );
diff --git a/lib/GL/mesa/src/drv/sis/sis_clear.c b/lib/GL/mesa/src/drv/sis/sis_clear.c
index 35067fa01..4c37d18d5 100644
--- a/lib/GL/mesa/src/drv/sis/sis_clear.c
+++ b/lib/GL/mesa/src/drv/sis/sis_clear.c
@@ -24,7 +24,7 @@ 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_clear.c,v 1.5 2000/09/26 15:56:48 tsi Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_clear.c,v 1.6tsi Exp $ */
 
 /*
  * Authors:
@@ -39,9 +39,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "swrast/swrast.h"
 #include "mmath.h"
 
+#if 0
 static GLbitfield sis_3D_Clear( GLcontext * ctx, GLbitfield mask,
 				GLint x, GLint y, GLint width,
 				GLint height );
+#endif
 static void sis_clear_color_buffer( GLcontext *ctx, GLenum mask, GLint x,
 				    GLint y, GLint width, GLint height );
 static void sis_clear_z_stencil_buffer( GLcontext * ctx,
diff --git a/programs/Xserver/GL/glx/singlesize.c b/programs/Xserver/GL/glx/singlesize.c
index 7f59816e9..869a26ee5 100644
--- a/programs/Xserver/GL/glx/singlesize.c
+++ b/programs/Xserver/GL/glx/singlesize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.5tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -35,6 +35,7 @@
 */
 
 #include <GL/gl.h>
+#include "glxserver.h"
 #include "singlesize.h"
 
 /*
diff --git a/programs/Xserver/hw/xfree86/ddc/print_vdif.c b/programs/Xserver/hw/xfree86/ddc/print_vdif.c
index f3ac49cf1..caea5caa1 100644
--- a/programs/Xserver/hw/xfree86/ddc/print_vdif.c
+++ b/programs/Xserver/hw/xfree86/ddc/print_vdif.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.3 2003/02/17 16:08:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */
 
 #include "vdif.h"
 #include "misc.h"
@@ -27,7 +27,7 @@ print_vdif(xf86VdifPtr l, char *s)
     ErrorF(" Date: %i/%i/%i, Manufactured: %i/%i/%i\n",l->Date[0],
 	   l->Date[1],l->Date[2],l->DateManufactured[0],
 	   l->DateManufactured[1],l->DateManufactured[2]);
-    ErrorF("File Revision: %li",l->FileRevision);
+    ErrorF("File Revision: %i",l->FileRevision);
     ErrorF("Manufacturer: %s\n",s + l->Manufacturer);
     ErrorF("ModelNumber: %s\n",s + l->ModelNumber);
     ErrorF("VDIFIndex: %s\n",s +l->MinVDIFIndex);
@@ -47,11 +47,11 @@ print_vdif(xf86VdifPtr l, char *s)
     case VDIF_MONITOR_MONOCHROME:
 	ErrorF("Border:  %i percent\n",
 	       l->BorderRed);
-	ErrorF("Phosphor Decay: 1: %li,",l->RedPhosphorDecay);
+	ErrorF("Phosphor Decay: 1: %i,",l->RedPhosphorDecay);
 	if (l->GreenPhosphorDecay !=0)
-	    ErrorF(" 2: %li,",l->GreenPhosphorDecay);
+	    ErrorF(" 2: %i,",l->GreenPhosphorDecay);
 	if (l->BluePhosphorDecay !=0)
-	    ErrorF(" 3: %li",l->BluePhosphorDecay);
+	    ErrorF(" 3: %i",l->BluePhosphorDecay);
 	ErrorF(" ms\n");
 	if (l->RedChromaticity_x)
 	    ErrorF("Chromaticity: 1: x:%f, y:%f;  ",
@@ -68,7 +68,7 @@ print_vdif(xf86VdifPtr l, char *s)
     case VDIF_MONITOR_COLOR:
 	ErrorF("Border: Red: %i Green: %i Blue: %i percent\n",
 	       l->BorderRed,l->BorderGreen,l->BorderBlue);
-	ErrorF("Phosphor Decay: Red: %li, Green: %li, Blue: %li ms\n",
+	ErrorF("Phosphor Decay: Red: %i, Green: %i, Blue: %i ms\n",
 	       l->RedPhosphorDecay,l->GreenPhosphorDecay,l->BluePhosphorDecay);
 	ErrorF("Chromaticity: Red: x:%f, y:%f;  Green: x:%f, y:%f;  "
 	       "Blue: x:%f, y:%f\n",
@@ -138,7 +138,7 @@ print_timings(xf86VdifTimingPtr *pt)
     xf86VdifTimingPtr t;
 
     while((t = pt[i]) != NULL) {
-	ErrorF("SVGA / SVPMI mode number: %li\n",t->PreadjustedTimingName);
+	ErrorF("SVGA / SVPMI mode number: %i\n",t->PreadjustedTimingName);
 	ErrorF("Mode %i x %i\n",t->HorPixel,t->VerPixel);
 	ErrorF("Size: %i x %i mm\n",t->HorAddrLength,t->VerAddrHeight);
 	ErrorF("Ratios: %i/%i\n",t->PixelWidthRatio,t->PixelHeightRatio);
diff --git a/programs/Xserver/hw/xfree86/ddc/vdif.h b/programs/Xserver/hw/xfree86/ddc/vdif.h
index 0218413a7..7a647031a 100644
--- a/programs/Xserver/hw/xfree86/ddc/vdif.h
+++ b/programs/Xserver/hw/xfree86/ddc/vdif.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.3 2000/04/14 12:16:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */
 
 #ifndef _VDIF_H
 #define _VDIF_H
@@ -24,6 +24,9 @@
 
 #include "Xmd.h"
 
+#undef  CARD32
+#define CARD32 unsigned int	/* ... on all supported platforms */
+
 typedef struct _VDIF { /* Monitor Description: */
     CARD8 VDIFId[4]; /* alway "VDIF" */
     CARD32 FileLength; /* lenght of the whole file */
@@ -167,4 +170,6 @@ typedef struct  _vdif {
     char * strings;
 } xf86vdif, *xf86vdifPtr;
 
+#undef CARD32
+
 #endif
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/r128.h b/programs/Xserver/hw/xfree86/drivers/ati/r128.h
index deaf52364..94c4845e7 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/r128.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/r128.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.24 2002/12/16 16:19:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h,v 1.25tsi Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
@@ -172,8 +172,8 @@ typedef struct {
 typedef struct {
     CARD16        reference_freq;
     CARD16        reference_div;
-    CARD32        min_pll_freq;
-    CARD32        max_pll_freq;
+    unsigned      min_pll_freq;
+    unsigned      max_pll_freq;
     CARD16        xclk;
 } R128PLLRec, *R128PLLPtr;
 
@@ -523,9 +523,9 @@ do {									\
       xf86DrvMsg( pScrn->scrnIndex, X_INFO,				\
 		  "ADVANCE_RING() used: %d+%d=%d/%d\n",			\
 		  info->indirectBuffer->used - info->indirectStart,	\
-		  __count * sizeof(CARD32),				\
+		  __count * (int)sizeof(CARD32),			\
 		  info->indirectBuffer->used - info->indirectStart +	\
-		  __count * sizeof(CARD32),				\
+		  __count * (int)sizeof(CARD32),			\
 		  info->indirectBuffer->total - info->indirectStart );	\
    }									\
    info->indirectBuffer->used += __count * (int)sizeof(CARD32);		\
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c b/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
index 7a6f513b5..19382f525 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.84tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.85tsi Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
@@ -711,7 +711,7 @@ static Bool R128GetPLLParameters(ScrnInfoPtr pScrn)
 #endif /* __powerpc__ */
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "PLL parameters: rf=%d rd=%d min=%ld max=%ld; xclk=%d\n",
+	       "PLL parameters: rf=%d rd=%d min=%d max=%d; xclk=%d\n",
 	       pll->reference_freq,
 	       pll->reference_div,
 	       pll->min_pll_freq,
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
index 87686b38b..e2456450a 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.41 2003/09/28 20:15:54 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.42tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -171,8 +171,8 @@ typedef struct {
     int               post_div;
 
 				/* PLL registers */
-    CARD32            ppll_ref_div;
-    CARD32            ppll_div_3;
+    unsigned          ppll_ref_div;
+    unsigned          ppll_div_3;
     CARD32            htotal_cntl;
 
 				/* Computed values for PLL2 */
@@ -675,7 +675,7 @@ do {									\
 		   "ADVANCE_RING() start: %d used: %d count: %d\n",	\
 		   info->indirectStart,					\
 		   info->indirectBuffer->used,				\
-		   __count * sizeof(CARD32));				\
+		   __count * (int)sizeof(CARD32));			\
     }									\
     info->indirectBuffer->used += __count * (int)sizeof(CARD32);	\
 } while (0)
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
index 67d2e5fe3..aad6fc7e7 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v 1.37 2003/09/24 02:43:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v 1.38tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario,
  *                VA Linux Systems Inc., Fremont, California.
@@ -716,8 +716,8 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
 {
     unsigned char *RADEONMMIO = info->MMIO;
     unsigned long mode   = drmAgpGetMode(info->drmFD);	/* Default mode */
-    unsigned long vendor = drmAgpVendorId(info->drmFD);
-    unsigned long device = drmAgpDeviceId(info->drmFD);
+    unsigned int  vendor = drmAgpVendorId(info->drmFD);
+    unsigned int  device = drmAgpDeviceId(info->drmFD);
 
     mode &= ~RADEON_AGP_MODE_MASK;
     switch (info->agpMode) {
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
index ffa43601a..f8ab458a5 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.112 2003/11/03 05:11:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.113tsi Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -5092,7 +5092,7 @@ static void RADEONRestorePLLRegisters(ScrnInfoPtr pScrn,
 	      | RADEON_PPLL_ATOMIC_UPDATE_EN
 	      | RADEON_PPLL_VGA_ATOMIC_UPDATE_EN));
 
-    xf86DrvMsg(0, X_INFO, "Wrote: rd=%ld, fd=%ld, pd=%ld\n",
+    xf86DrvMsg(0, X_INFO, "Wrote: rd=%d, fd=%d, pd=%d\n",
 	       restore->ppll_ref_div & RADEON_PPLL_REF_DIV_MASK,
 	       restore->ppll_div_3 & RADEON_PPLL_FB3_DIV_MASK,
 	       (restore->ppll_div_3 & RADEON_PPLL_POST3_DIV_MASK) >> 16);
diff --git a/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c b/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c
index a332e288b..270e046ad 100644
--- a/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c
@@ -50,7 +50,7 @@
  *		(note that most of the data books have been released by
  *		 NatSemi and are downloadable for free as pdf files)
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.29tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
 
 #include "fb.h"
 #include "mibank.h"
@@ -549,7 +549,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
     int videoram;
     int i;
     ClockRangePtr clockRanges;
-    CARD32 physbase, padsize;
+    unsigned int physbase, padsize;
     int device_step, device_revision;
     int vgaIOBase;
     unsigned char gcr;
@@ -617,8 +617,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
     /*      end GGI MediaGX driver based code */
     if (padsize == 0) return (FALSE);
 
-    xf86ErrorF("%s: GX_BASE: 0x%lx\n",CYRIX_NAME, (unsigned long)physbase);
-    xf86ErrorF("%s: Scratchpad size: %ld kbytes\n",CYRIX_NAME, padsize);
+    xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase);
+    xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize);
 
     /* Probe for the MediaGX processor version details.  Older versions
      * use different op-codes for setting the organization of the
diff --git a/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c b/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c
index 0a7541b25..f47ae0fc5 100644
--- a/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c
+++ b/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.3tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -322,7 +322,7 @@ I128ProgramIBMRGB(ScrnInfoPtr pScrn, DisplayModePtr mode)
    I128Ptr pI128 = I128PTR(pScrn);
    unsigned char tmp2, m, n, df, best_m, best_n, best_df, max_n;
    CARD32 tmpl, tmph, tmpc;
-   long f, vrf, outf, best_diff, best_outf, diff;
+   long f, vrf, outf, best_diff, best_outf = 0, diff;
    long requested_freq;
    int   freq = mode->SynthClock;
    int   flags = mode->Flags;
@@ -531,7 +531,7 @@ I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode)
    I128Ptr pI128 = I128PTR(pScrn);
    unsigned char tmp2, m, n, df, best_m, best_n, best_df, max_n;
    CARD32 tmpl, tmph, tmpc;
-   long f, vrf, outf, best_diff, best_outf, diff;
+   long f, vrf, outf, best_diff, best_outf = 0, diff;
    long requested_freq;
    int   freq = mode->SynthClock;
    int   flags = mode->Flags;
@@ -730,5 +730,3 @@ I128ProgramSilverHammer(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
    return(TRUE);
 }
-
-
diff --git a/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c b/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c
index 713453c30..b4b17df90 100644
--- a/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.33tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.34tsi Exp $ */
 
 
 /* All drivers should typically include these */
@@ -2061,14 +2061,13 @@ I128DumpBaseRegisters(ScrnInfoPtr pScrn)
 	"  IO Mapped Registers\n");
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 	"    RBASE_G   0x%08lx  addr 0x%08lx\n",
-	    pI128->io.rbase_g, pI128->io.rbase_g & 0xFFFFFF00UL);
+	    (unsigned long)pI128->io.rbase_g, pI128->io.rbase_g & 0xFFFFFF00UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 	"    RBASE_W   0x%08lx  addr 0x%08lx\n",
 	    (unsigned long)pI128->io.rbase_w, pI128->io.rbase_w & 0xFFFFFF00UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 	"    RBASE_A   0x%08lx  addr 0x%08lx\n",
-	    (unsigned long)pI128->io.rbase_a,
-	    pI128->io.rbase_a & 0xFFFFFF00);
+	    (unsigned long)pI128->io.rbase_a, pI128->io.rbase_a & 0xFFFFFF00UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 	"    RBASE_B   0x%08lx  addr 0x%08lx\n",
 	    (unsigned long)pI128->io.rbase_b, pI128->io.rbase_b & 0xFFFFFF00UL);
@@ -2192,134 +2191,177 @@ I128DumpActiveRegisters(ScrnInfoPtr pScrn)
 
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "CRT Registers\n");
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INT_VCNT 0x%08lx  (%ld)\n",
-    	vrbg[0x20/4]&0xFF, vrbg[0x20/4]&0xFF);
+    	vrbg[0x20/4]&0x000000FFUL, vrbg[0x20/4]&0x000000FFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INT_HCNT 0x%08lx  (%ld)\n",
-    	vrbg[0x24/4]&0xFFF, vrbg[0x24/4]&0xFFF);
+    	vrbg[0x24/4]&0x00000FFFUL, vrbg[0x24/4]&0x00000FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DB_ADR   0x%08lx  (%ld)\n",
-    	vrbg[0x28/4]&0x01FFFFF0, vrbg[0x28/4]&0x01FFFFF0);
+    	vrbg[0x28/4]&0x01FFFFF0UL, vrbg[0x28/4]&0x01FFFFF0UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DB_PTCH  0x%08lx  (%ld)\n",
-    	vrbg[0x2C/4]&0xFFF0, vrbg[0x2C/4]&0xFFF0);
+    	vrbg[0x2C/4]&0x0000FFF0UL, vrbg[0x2C/4]&0x0000FFF0UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_HAC  0x%08lx  (%ld)\n",
-    	vrbg[0x30/4]&0x3FFF, vrbg[0x30/4]&0x3FFF);
+    	vrbg[0x30/4]&0x00003FFFUL, vrbg[0x30/4]&0x00003FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_HBL  0x%08lx  (%ld)\n",
-    	vrbg[0x34/4]&0x3FFF, vrbg[0x34/4]&0x3FFF);
+    	vrbg[0x34/4]&0x00003FFFUL, vrbg[0x34/4]&0x00003FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_HFP  0x%08lx  (%ld)\n",
-    	vrbg[0x38/4]&0x3FFF, vrbg[0x38/4]&0x3FFF);
+    	vrbg[0x38/4]&0x00003FFFUL, vrbg[0x38/4]&0x00003FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_HS   0x%08lx  (%ld)\n",
-    	vrbg[0x3C/4]&0x3FFF, vrbg[0x3C/4]&0x3FFF);
+    	vrbg[0x3C/4]&0x00003FFFUL, vrbg[0x3C/4]&0x00003FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_VAC  0x%08lx  (%ld)\n",
-    	vrbg[0x40/4]&0xFFF, vrbg[0x40/4]&0xFFF);
+    	vrbg[0x40/4]&0x00000FFFUL, vrbg[0x40/4]&0x00000FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_VBL  0x%08lx  (%ld)\n",
-    	vrbg[0x44/4]&0xFFF, vrbg[0x44/4]&0xFFF);
+    	vrbg[0x44/4]&0x00000FFFUL, vrbg[0x44/4]&0x00000FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_VFP  0x%08lx  (%ld)\n",
-    	vrbg[0x48/4]&0xFFF, vrbg[0x48/4]&0xFFF);
+    	vrbg[0x48/4]&0x00000FFFUL, vrbg[0x48/4]&0x00000FFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_VS   0x%08lx  (%ld)\n",
-    	vrbg[0x4C/4]&0xFFF, vrbg[0x4C/4]&0xFFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_LCNT 0x%08lx\n", vrbg[0x50/4]&0x0FFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_ZOOM 0x%08lx\n", vrbg[0x54/4]&0xF);
+    	vrbg[0x4C/4]&0x00000FFFUL, vrbg[0x4C/4]&0x00000FFFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_LCNT 0x%08lx\n",
+	vrbg[0x50/4]&0x00000FFFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_ZOOM 0x%08lx\n",
+	vrbg[0x54/4]&0x0000000FUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_1CON 0x%08lx  PH %ld  PV %ld  CS %ld INL %ld H/VSE %ld/%ld VE %ld BTS %ld\n",
-        vrbg[0x58/4],
-    	vrbg[0x58/4]&1, (vrbg[0x58/4]>>1)&1, (vrbg[0x58/4]>>2)&1,
-    	(vrbg[0x58/4]>>3)&1, (vrbg[0x58/4]>>4)&1, (vrbg[0x58/4]>>5)&1,
-    	(vrbg[0x58/4]>>6)&1, (vrbg[0x58/4]>>8)&1);
+        (unsigned long)vrbg[0x58/4],
+    	vrbg[0x58/4]&1UL, (vrbg[0x58/4]>>1)&1UL, (vrbg[0x58/4]>>2)&1UL,
+    	(vrbg[0x58/4]>>3)&1UL, (vrbg[0x58/4]>>4)&1UL, (vrbg[0x58/4]>>5)&1UL,
+    	(vrbg[0x58/4]>>6)&1UL, (vrbg[0x58/4]>>8)&1UL);
     
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CRT_2CON 0x%08lx  MEM %ld  RFR %ld  TRD %ld  SPL %ld\n",
-        vrbg[0x5C/4],
-    	vrbg[0x5C/4]&7, (vrbg[0x5C/4]>>8)&1,
-    	(vrbg[0x5C/4]>>16)&7, (vrbg[0x5C/4]>>24)&1);
+        (unsigned long)vrbg[0x5C/4],
+    	vrbg[0x5C/4]&7UL, (vrbg[0x5C/4]>>8)&1UL,
+    	(vrbg[0x5C/4]>>16)&7UL, (vrbg[0x5C/4]>>24)&1UL);
     
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Memory Windows Registers\n");
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW0_CTRL 0x%08lx\n", vrbw[0x00]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW0_CTRL 0x%08lx\n",
+	(unsigned long)vrbw[0x00]);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    AMV %ld  MP %ld  AMD %ld  SEN %ld  BSY %ld  MDM %ld  DEN %ld  PSZ %ld\n",
-    	(vrbw[0x00]>>1)&1, (vrbw[0x00]>>2)&1, (vrbw[0x00]>>3)&1,
-    	(vrbw[0x00]>>4)&3, (vrbw[0x00]>>8)&1, (vrbw[0x00]>>21)&3,
-    	(vrbw[0x00]>>24)&3, (vrbw[0x00]>>26)&3);
+    	(vrbw[0x00]>>1)&1UL, (vrbw[0x00]>>2)&1UL, (vrbw[0x00]>>3)&1UL,
+    	(vrbw[0x00]>>4)&3UL, (vrbw[0x00]>>8)&1UL, (vrbw[0x00]>>21)&3UL,
+    	(vrbw[0x00]>>24)&3UL, (vrbw[0x00]>>26)&3UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "M/V/DSE %ld/%ld/%ld\n",
-	(vrbw[0x00]>>28)&1, (vrbw[0x00]>>29)&1, (vrbw[0x00]>>30)&1);
+	(vrbw[0x00]>>28)&1UL, (vrbw[0x00]>>29)&1UL, (vrbw[0x00]>>30)&1UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW0_AD    0x%08lx  MW0_SZ    0x%08lx  MW0_PGE   0x%08lx\n",
-    	vrbw[0x04/4]&0xFFFFF000, vrbw[0x08/4]&0x0000000F,
-    	vrbw[0x0C/4]&0x000F001F);
+    	vrbw[0x04/4]&0xFFFFF000UL, vrbw[0x08/4]&0x0000000FUL,
+    	vrbw[0x0C/4]&0x000F001FUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW0_ORG10 0x%08lx  MW0_ORG14 0x%08lx  MW0_MSRC  0x%08lx\n",
-    	vrbw[0x10/4]&0x01FFF000, vrbw[0x14/4]&0x01FFF000,
-    	vrbw[0x18/4]&0x00FFFF00);
+    	vrbw[0x10/4]&0x01FFF000UL, vrbw[0x14/4]&0x01FFF000UL,
+    	vrbw[0x18/4]&0x00FFFF00UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW0_WKEY  0x%08lx  MW0_KYDAT 0x%08lx  MW0_MASK  0x%08lx\n",
-    	vrbw[0x1C/4], vrbw[0x20/4]&0x000F000F, vrbw[0x24/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW1_CTRL 0x%08lx\n", vrbw[0x28/4]);
+    	(unsigned long)vrbw[0x1C/4], vrbw[0x20/4]&0x000F000FUL,
+	(unsigned long)vrbw[0x24/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW1_CTRL 0x%08lx\n",
+	(unsigned long)vrbw[0x28/4]);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    AMV %ld  MP %ld  AMD %ld  SEN %ld  BSY %ld  MDM %ld  DEN %ld  PSZ %ld\n",
-    	(vrbw[0x28/4]>>1)&1, (vrbw[0x28/4]>>2)&1, (vrbw[0x28/4]>>3)&1,
-    	(vrbw[0x28/4]>>4)&3, (vrbw[0x28/4]>>8)&1, (vrbw[0x28/4]>>21)&3,
-    	(vrbw[0x28/4]>>24)&3, (vrbw[0x28/4]>>26)&3);
+    	(vrbw[0x28/4]>>1)&1UL, (vrbw[0x28/4]>>2)&1UL, (vrbw[0x28/4]>>3)&1UL,
+    	(vrbw[0x28/4]>>4)&3UL, (vrbw[0x28/4]>>8)&1UL, (vrbw[0x28/4]>>21)&3UL,
+    	(vrbw[0x28/4]>>24)&3UL, (vrbw[0x28/4]>>26)&3UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "M/V/DSE %ld/%ld/%ld\n",
-	(vrbw[0x28/4]>>28)&1, (vrbw[0x28/4]>>29)&1, (vrbw[0x28/4]>>30)&1);
+	(vrbw[0x28/4]>>28)&1UL, (vrbw[0x28/4]>>29)&1UL, (vrbw[0x28/4]>>30)&1UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW1_AD    0x%08lx  MW1_SZ    0x%08lx  MW1_PGE   0x%08lx\n",
-    	vrbw[0x2C/4]&0xFFFFF000, vrbw[0x30/4]&0x0000000F,
-    	vrbw[0x34/4]&0x000F001F);
+    	vrbw[0x2C/4]&0xFFFFF000UL, vrbw[0x30/4]&0x0000000FUL,
+    	vrbw[0x34/4]&0x000F001FUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW1_ORG10 0x%08lx  MW1_ORG14 0x%08lx  MW1_MSRC  0x%08lx\n",
-    	vrbw[0x38/4]&0x01FFF000, vrbw[0x3c/4]&0x01FFF000,
-    	vrbw[0x40/4]&0x00FFFF00);
+    	vrbw[0x38/4]&0x01FFF000UL, vrbw[0x3c/4]&0x01FFF000UL,
+    	vrbw[0x40/4]&0x00FFFF00UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MW1_WKEY  0x%08lx  MW1_KYDAT 0x%08lx  MW1_MASK  0x%08lx\n",
-    	vrbw[0x44/4], vrbw[0x48/4]&0x000F000F, vrbw[0x4C/4]);
+    	(unsigned long)vrbw[0x44/4], vrbw[0x48/4]&0x000F000FUL,
+	(unsigned long)vrbw[0x4C/4]);
     
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Engine A Registers\n");
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INTP      0x%08lx\n", vrba[0x00/4]&0x03);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INTM      0x%08lx\n", vrba[0x04/4]&0x03);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  FLOW      0x%08lx\n", vrba[0x08/4]&0x0F);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BUSY      0x%08lx\n", vrba[0x0C/4]&0x01);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INTP      0x%08lx\n",
+	vrba[0x00/4]&0x03UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  INTM      0x%08lx\n",
+	vrba[0x04/4]&0x03UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  FLOW      0x%08lx\n",
+	vrba[0x08/4]&0x0FUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BUSY      0x%08lx\n",
+	vrba[0x0C/4]&0x01UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XYW_AD    0x%08lx  SIZE 0x%lx  ADDR 0x%lx\n",
-    	vrba[0x10/4]&0xFFFFFF00, (vrba[0x10/4]>>8)&0x0F,
-    	vrba[0x10/4]&0xFFFFF000);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  ZCTL      0x%08lx\n", vrba[0x18/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BUF_CTRL  0x%08lx\n", vrba[0x20/4]);
+    	vrba[0x10/4]&0xFFFFFF00UL, (vrba[0x10/4]>>8)&0x0000000FUL,
+    	vrba[0x10/4]&0xFFFFF000UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  ZCTL      0x%08lx\n",
+	(unsigned long)vrba[0x18/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BUF_CTRL  0x%08lx\n",
+	(unsigned long)vrba[0x20/4]);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    AMV %ld  MP %ld  AMD %ld  SEN %ld  DEN %ld  DSE %ld  VSE %ld  MSE %ld\n",
-    	(vrba[0x20/4]>>1)&1, (vrba[0x20/4]>>2)&1, (vrba[0x20/4]>>3)&1,
-    	(vrba[0x20/4]>>8)&3, (vrba[0x20/4]>>10)&3, (vrba[0x20/4]>>12)&1,
-    	(vrba[0x20/4]>>13)&1, (vrba[0x20/4]>>14)&1);
+    	(vrba[0x20/4]>>1)&1UL, (vrba[0x20/4]>>2)&1UL, (vrba[0x20/4]>>3)&1UL,
+    	(vrba[0x20/4]>>8)&3UL, (vrba[0x20/4]>>10)&3UL, (vrba[0x20/4]>>12)&1UL,
+    	(vrba[0x20/4]>>13)&1UL, (vrba[0x20/4]>>14)&1UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    PS %ld  MDM %ld  PSIZE %ld  CRCO %ld\n",
-	(vrba[0x20/4]>>16)&0x1F,
-    	(vrba[0x20/4]>>21)&3, (vrba[0x20/4]>>24)&3, (vrba[0x20/4]>>30)&3);
+	(vrba[0x20/4]>>16)&0x1FUL,
+    	(vrba[0x20/4]>>21)&3UL, (vrba[0x20/4]>>24)&3UL, (vrba[0x20/4]>>30)&3UL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_PGE    0x%08lx  DVPGE 0x%lx  MPGE 0x%lx\n",
-    	vrba[0x24/4]&0x000F001F, (vrba[0x24/4]>>8)&0x01F,
-    	(vrba[0x24/4]&0x000F0000)>>16);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_SORG   0x%08lx\n", vrba[0x28/4]&0x0FFFFFFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_DORG   0x%08lx\n", vrba[0x2C/4]&0x0FFFFFFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_MSRC   0x%08lx\n", vrba[0x30/4]&0x03FFFFF0);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_WKEY   0x%08lx\n", vrba[0x38/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_ZPTCH  0x%08lx\n", vrba[0x3C/4]&0x000FFFF0);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_SPTCH  0x%08lx\n", vrba[0x40/4]&0x0000FFF0);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_DPTCH  0x%08lx\n", vrba[0x44/4]&0x0000FFF0);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD       0x%08lx\n", vrba[0x48/4]&0x7FFFFFFF);
+    	vrba[0x24/4]&0x000F001FUL, (vrba[0x24/4]>>8)&0x01FUL,
+    	(vrba[0x24/4]&0x000F0000UL)>>16);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_SORG   0x%08lx\n",
+	vrba[0x28/4]&0x0FFFFFFFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_DORG   0x%08lx\n",
+	vrba[0x2C/4]&0x0FFFFFFFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_MSRC   0x%08lx\n",
+	vrba[0x30/4]&0x03FFFFF0UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_WKEY   0x%08lx\n",
+	(unsigned long)vrba[0x38/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_ZPTCH  0x%08lx\n",
+	vrba[0x3C/4]&0x000FFFF0UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_SPTCH  0x%08lx\n",
+	vrba[0x40/4]&0x0000FFF0UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  DE_DPTCH  0x%08lx\n",
+	vrba[0x44/4]&0x0000FFF0UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD       0x%08lx\n",
+	vrba[0x48/4]&0x7FFFFFFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    OPC 0x%02lx  ROP 0x%02lx  STYLE 0x%02lx  CLP 0x%lx  PATRN 0x%lx  HDF %ld\n",
-    	vrba[0x48/4]&0xFF, (vrba[0x48/4]>>8)&0xFF, (vrba[0x48/4]>>16)&0x1F,
-    	(vrba[0x48/4]>>21)&7, (vrba[0x48/4]>>24)&0xF, (vrba[0x48/4]>>28)&7);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_SHADE 0x%02lx\n", vrba[0x4C/4]&0xFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_OPC   0x%02lx\n", vrba[0x50/4]&0xFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_ROP   0x%02lx\n", vrba[0x54/4]&0xFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_STYLE 0x%02lx\n", vrba[0x58/4]&0x1F);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_PATRN 0x%02lx\n", vrba[0x5C/4]&0x0F);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_CLP   0x%02lx\n", vrba[0x60/4]&0x07);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_HDF   0x%02lx\n", vrba[0x64/4]&0x07);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  FORE      0x%08lx\n", vrba[0x68/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BACK      0x%08lx\n", vrba[0x6C/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MASK      0x%08lx\n", vrba[0x70/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  RMSK      0x%08lx\n", vrba[0x74/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  LPAT      0x%08lx\n", vrba[0x78/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  PCTRL     0x%08lx\n", vrba[0x7C/4]);
+    	vrba[0x48/4]&0x00FFUL, (vrba[0x48/4]>>8)&0x00FFUL, (vrba[0x48/4]>>16)&0x001FUL,
+    	(vrba[0x48/4]>>21)&7UL, (vrba[0x48/4]>>24)&0x0FUL, (vrba[0x48/4]>>28)&7UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_SHADE 0x%02lx\n",
+	vrba[0x4C/4]&0x00FFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_OPC   0x%02lx\n",
+	vrba[0x50/4]&0x00FFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_ROP   0x%02lx\n",
+	vrba[0x54/4]&0x00FFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_STYLE 0x%02lx\n",
+	vrba[0x58/4]&0x001FUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_PATRN 0x%02lx\n",
+	vrba[0x5C/4]&0x000FUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_CLP   0x%02lx\n",
+	vrba[0x60/4]&0x0007UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CMD_HDF   0x%02lx\n",
+	vrba[0x64/4]&0x0007UL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  FORE      0x%08lx\n",
+	(unsigned long)vrba[0x68/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  BACK      0x%08lx\n",
+	(unsigned long)vrba[0x6C/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  MASK      0x%08lx\n",
+	(unsigned long)vrba[0x70/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  RMSK      0x%08lx\n",
+	(unsigned long)vrba[0x74/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  LPAT      0x%08lx\n",
+	(unsigned long)vrba[0x78/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  PCTRL     0x%08lx\n",
+	(unsigned long)vrba[0x7C/4]);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "    PLEN 0x%02ld  PSCL 0x%02ld  SPTR 0x%02ld  SSCL 0x%lx  STATE 0x%04lx\n",
-    	vrba[0x7C/4]&0x1F, (vrba[0x7C/4]>>5)&7, (vrba[0x7C/4]>>8)&0x1F,
-    	(vrba[0x7C/4]>>13)&7, (vrba[0x7C/4]>>16)&0xFFFF);
+    	vrba[0x7C/4]&0x1FUL, (vrba[0x7C/4]>>5)&7UL, (vrba[0x7C/4]>>8)&0x1FUL,
+    	(vrba[0x7C/4]>>13)&7UL, (vrba[0x7C/4]>>16)&0xFFFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CLPTL     0x%08lx  CLPTLY 0x%04lx  CLPTLX 0x%04lx\n",
-    	vrba[0x80/4], vrba[0x80/4]&0xFFFF, (vrba[0x80/4]>>16)&0xFFFF);
+    	(unsigned long)vrba[0x80/4], vrba[0x80/4]&0x00FFFFUL, (vrba[0x80/4]>>16)&0x00FFFFUL);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  CLPBR     0x%08lx  CLPBRY 0x%04lx  CLPBRX 0x%04lx\n",
-    	vrba[0x84/4], vrba[0x84/4]&0xFFFF, (vrba[0x84/4]>>16)&0xFFFF);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY0       0x%08lx\n", vrba[0x88/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY1       0x%08lx\n", vrba[0x8C/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY2       0x%08lx\n", vrba[0x90/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY3       0x%08lx\n", vrba[0x94/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY4       0x%08lx\n", vrba[0x98/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY5       0x%08lx\n", vrba[0x9C/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY6       0x%08lx\n", vrba[0xA0/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY7       0x%08lx\n", vrba[0xA4/4]);
-    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY8       0x%08lx\n", vrba[0xA8/4]);
+    	(unsigned long)vrba[0x84/4],
+	vrba[0x84/4]&0x00FFFFUL, (vrba[0x84/4]>>16)&0x00FFFFUL);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY0       0x%08lx\n",
+	(unsigned long)vrba[0x88/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY1       0x%08lx\n",
+	(unsigned long)vrba[0x8C/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY2       0x%08lx\n",
+	(unsigned long)vrba[0x90/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY3       0x%08lx\n",
+	(unsigned long)vrba[0x94/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY4       0x%08lx\n",
+	(unsigned long)vrba[0x98/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY5       0x%08lx\n",
+	(unsigned long)vrba[0x9C/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY6       0x%08lx\n",
+	(unsigned long)vrba[0xA0/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY7       0x%08lx\n",
+	(unsigned long)vrba[0xA4/4]);
+    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  XY8       0x%08lx\n",
+	(unsigned long)vrba[0xA8/4]);
     if (pI128->RamdacType != TI3025_DAC)
 	I128DumpIBMDACRegisters(pScrn, vrbg);
 }
diff --git a/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c b/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
index 38458418a..755c0db83 100644
--- a/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
+++ b/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.30 2003/09/24 02:43:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.31tsi Exp $ */
 
 /*
  * Copyright 2000 VA Linux Systems Inc., Fremont, California.
@@ -1078,8 +1078,8 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
 
    xf86DrvMsg( pScrn->scrnIndex, X_INFO,
 	       "[drm] Sarea %d+%d: %d\n",
-	       sizeof(XF86DRISAREARec), sizeof(MGASAREAPrivRec),
-	       sizeof(XF86DRISAREARec) + sizeof(MGASAREAPrivRec) );
+	       (int)sizeof(XF86DRISAREARec), (int)sizeof(MGASAREAPrivRec),
+	       (int)sizeof(XF86DRISAREARec) + (int)sizeof(MGASAREAPrivRec) );
 
    pDRIInfo->SAREASize = SAREA_MAX;
 
diff --git a/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c b/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
index 749156c2d..f38f7b361 100644
--- a/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
+++ b/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.17 2003/03/25 04:18:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */
 /*
  * includes
  */
@@ -230,8 +230,8 @@ verite_check_csucode(ScrnInfoPtr pScreenInfo)
     if (csrisc[c] != verite_read_memory32(vmb, offset)) {
       ErrorF("csucode mismatch in word %02d: 0x%08lx should be 0x%08lx\n",
 	     c,
-	     verite_read_memory32(vmb, offset),
-	     csrisc[c]);
+	     (unsigned long)verite_read_memory32(vmb, offset),
+	     (unsigned long)csrisc[c]);
       mismatches++;
     }
 #ifdef DEBUG
diff --git a/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c b/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c
index 4264b9968..a052ce8e2 100644
--- a/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c
+++ b/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.12 2000/04/07 03:57:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.13tsi Exp $ */
 /*
  * includes
  */
@@ -177,7 +177,8 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
   vu32 physAddr=SW32(phdr->p_paddr);
 
   if (lseek(fd, offset, SEEK_SET) != offset) {
-	ErrorF("RENDITION: Failure in loadSegmentToBoard, offset %lx\n", offset);
+	ErrorF("RENDITION: Failure in loadSegmentToBoard, offset %lx\n",
+		(unsigned long)offset);
     return;
   }
 
diff --git a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c
index c7f6e78d4..82426d59e 100644
--- a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c
+++ b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c,v 1.23 2001/12/13 18:01:50 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c,v 1.24tsi Exp $ */
 
 /*
 Copyright (C) 1994-1999 The XFree86 Project, Inc.  All Rights Reserved.
@@ -245,7 +245,7 @@ S3VNopAllCmdSets(ScrnInfoPtr pScrn)
 
   if (xf86GetVerbosity() > 1) {
      ErrorF("\tTrio3D -- S3VNopAllCmdSets: SubsysStats#1 = 0x%08lx\n",
-        IN_SUBSYS_STAT());
+        (unsigned long)IN_SUBSYS_STAT());
   }
 
   mem_barrier();
@@ -267,7 +267,7 @@ S3VNopAllCmdSets(ScrnInfoPtr pScrn)
 
   if (xf86GetVerbosity() > 1) {
      ErrorF("\tTrio3D -- S3VNopAllCmdSets: SubsysStats#2 = 0x%08lx\n",
-        IN_SUBSYS_STAT());
+        (unsigned long)IN_SUBSYS_STAT());
   }
 }
 
@@ -415,8 +415,8 @@ S3VGEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file)
 
       if((IN_SUBSYS_STAT() & 0x3f802000 & 0x20002000) != 0x20002000) {
         if(xf86GetVerbosity() > 1)
-          ErrorF("restarting S3 graphics engine reset %2d ..."
-                 "%lx\n",r,IN_SUBSYS_STAT());
+          ErrorF("restarting S3 graphics engine reset %2d ...%lx\n",
+		 r, (unsigned long)IN_SUBSYS_STAT());
       }
         else
           break;
diff --git a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c
index 29398191d..816f60ab2 100644
--- a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.91 2003/09/24 02:43:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.92tsi Exp $ */
 
 /*
 Copyright (C) 1994-1999 The XFree86 Project, Inc.  All Rights Reserved.
@@ -1908,10 +1908,10 @@ S3VSave (ScrnInfoPtr pScrn)
 
       xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
          "MMPR regs: %08lx %08lx %08lx %08lx\n",
-	     INREG(FIFO_CONTROL_REG), 
-	     INREG(MIU_CONTROL_REG), 
-	     INREG(STREAMS_TIMEOUT_REG), 
-	     INREG(MISC_TIMEOUT_REG));
+	     (unsigned long)INREG(FIFO_CONTROL_REG), 
+	     (unsigned long)INREG(MIU_CONTROL_REG), 
+	     (unsigned long)INREG(STREAMS_TIMEOUT_REG), 
+	     (unsigned long)INREG(MISC_TIMEOUT_REG));
        }
 
       PVERB5("\n\nViRGE driver: saved current video mode. Register dump:\n\n");
diff --git a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c
index 5eec3466a..0dddd03f5 100644
--- a/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c
+++ b/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.8tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.9tsi Exp $ */
 /*
 Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
 
@@ -472,8 +472,6 @@ S3VStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
   S3VPtr ps3v = S3VPTR(pScrn);
   S3VPortPrivPtr pPriv = ps3v->portPrivate;
 
-  vgaHWPtr hwp = VGAHWPTR(pScrn);
-
 #if 0
   MGAPtr pMga = MGAPTR(pScrn);
   MGAPortPrivPtr pPriv = pMga->portPrivate;
diff --git a/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c b/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
index c80305a2d..8415d10cd 100644
--- a/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.47tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.48tsi Exp $ */
 /*
  * vim: sw=4 ts=8 ai ic:
  *
@@ -373,7 +373,8 @@ ResetBCI2K( SavagePtr psav )
 	! (ALT_STATUS_WORD0 & 0x00200000)
     )
     {
-	ErrorF( "Resetting BCI, stat = %08lx...\n", ALT_STATUS_WORD0);
+	ErrorF( "Resetting BCI, stat = %08lx...\n",
+		(unsigned long) ALT_STATUS_WORD0);
 	/* Turn off BCI */
 	OUTREG( 0x48c18, cob & ~8 );
 	usleep(10000);
diff --git a/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c b/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c
index 1ad8cdf29..d6566bb56 100644
--- a/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c
+++ b/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.15 2003/06/18 16:17:40 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.16tsi Exp $ */
 
 #include "Xv.h"
 #include "dix.h"
@@ -299,9 +299,9 @@ unsigned int GetBlendForFourCC( int id )
 void myOUTREG( SavagePtr psav, unsigned long offset, unsigned long value )
 {
     ErrorF( "MMIO %04lx, was %08lx, want %08lx,", 
-	offset, MMIO_IN32( psav->MapBase, offset ), value );
+	offset, (unsigned long)MMIO_IN32( psav->MapBase, offset ), value );
     MMIO_OUT32( psav->MapBase, offset, value );
-    ErrorF( " now %08lx\n", MMIO_IN32( psav->MapBase, offset ) );
+    ErrorF( " now %08lx\n", (unsigned long)MMIO_IN32( psav->MapBase, offset ) );
 }
 
 void SavageInitStreamsOld(ScrnInfoPtr pScrn)
diff --git a/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c b/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c
index 8135c9f1d..a75ea59a4 100644
--- a/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c
@@ -26,7 +26,7 @@ Silicon Motion shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from The XFree86 Project or Silicon Motion.
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c,v 1.35tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c,v 1.36tsi Exp $ */
 
 #include "xf86Resources.h"
 #include "xf86RAC.h"
@@ -3210,21 +3210,21 @@ SMI_PrintRegs(ScrnInfoPtr pScrn)
 	for (i = 0x00; i <= 0x44; i += 4)
 	{
 		if ((i & 0xF) == 0x0) xf86ErrorFVerb(VERBLEV, "\n%02X|", i);
-		xf86ErrorFVerb(VERBLEV, " %08lX", READ_DPR(pSmi, i));
+		xf86ErrorFVerb(VERBLEV, " %08lX", (unsigned long)READ_DPR(pSmi, i));
 	}
 
 	xf86ErrorFVerb(VERBLEV, "\n\nVPR    x0       x4       x8       xC");
 	for (i = 0x00; i <= 0x60; i += 4)
 	{
 		if ((i & 0xF) == 0x0) xf86ErrorFVerb(VERBLEV, "\n%02X|", i);
-		xf86ErrorFVerb(VERBLEV, " %08lX", READ_VPR(pSmi, i));
+		xf86ErrorFVerb(VERBLEV, " %08lX", (unsigned long)READ_VPR(pSmi, i));
 	}
 
 	xf86ErrorFVerb(VERBLEV, "\n\nCPR    x0       x4       x8       xC");
 	for (i = 0x00; i <= 0x18; i += 4)
 	{
 		if ((i & 0xF) == 0x0) xf86ErrorFVerb(VERBLEV, "\n%02X|", i);
-		xf86ErrorFVerb(VERBLEV, " %08lX", READ_CPR(pSmi, i));
+		xf86ErrorFVerb(VERBLEV, " %08lX", (unsigned long)READ_CPR(pSmi, i));
 	}
 
 	xf86ErrorFVerb(VERBLEV, "\n\n");
diff --git a/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c b/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
index 7a16bf2d5..06d3c0ace 100644
--- a/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
+++ b/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v 1.35tsi Exp $ */
 /*
  *  DRI wrapper for 300 and 315 series
  *
@@ -359,9 +359,9 @@ Bool SISDRIScreenInit(ScreenPtr pScreen)
       fb.size = pSIS->DRIheapend - pSIS->DRIheapstart;
       drmCommandWrite(pSIS->drmSubFD, DRM_SIS_FB_INIT, &fb, sizeof(fb));
       xf86DrvMsg(pScreen->myNum, X_INFO,
-                 "[dri] DRI video RAM memory heap: 0x%x to 0x%x (%dKB)\n",
+                 "[dri] DRI video RAM memory heap: 0x%lx to 0x%lx (%dKB)\n",
                  pSIS->DRIheapstart, pSIS->DRIheapend,
-                 (pSIS->DRIheapend - pSIS->DRIheapstart) >> 10);
+                 (int)((pSIS->DRIheapend - pSIS->DRIheapstart) >> 10));
     }
     drmFreeVersion(version);
   }
diff --git a/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c b/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c
index 10fbf43f3..33e083b8f 100644
--- a/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c
+++ b/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c,v 1.23tsi Exp $ */
 /*
  * Basic hardware and memory detection
  *
@@ -493,7 +493,8 @@ sis550Setup(ScrnInfoPtr pScrn)
 	  
 	  if((pScrn->videoRam < 32768) || (pScrn->videoRam > 131072)) {
 	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-	     	"Illegal video Ram size (%d) detected, using BIOS setting\n");
+	     	"Illegal video Ram size (%d) detected, using BIOS setting\n",
+		pScrn->videoRam);
 	  } else {
 	     pSiS->BusWidth = 64;
 	     ramtype = 8;
diff --git a/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c b/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
index e55a839bd..e9041e933 100644
--- a/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
+++ b/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
@@ -28,7 +28,7 @@
  *	    Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the
  *				   clockchip programming code.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.187tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.188tsi Exp $ */
 
 #include "xf1bpp.h"
 #include "xf4bpp.h"
@@ -1513,7 +1513,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
     	}
 
     	xf86DrvMsg(pScrn->scrnIndex,X_PROBED,"IO registers at 0x%lX\n",
-							pTrident->IOAddress);
+		   (unsigned long)pTrident->IOAddress);
     }
 
     /* Register the PCI-assigned resources. */
diff --git a/programs/Xserver/hw/xfree86/drivers/via/via_driver.h b/programs/Xserver/hw/xfree86/drivers/via/via_driver.h
index d10c9ce34..f3e477375 100644
--- a/programs/Xserver/hw/xfree86/drivers/via/via_driver.h
+++ b/programs/Xserver/hw/xfree86/drivers/via/via_driver.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.h,v 1.6tsi Exp $ */
 /*
  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
  * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -303,7 +303,7 @@ typedef struct _VIA {
     VIAConfigPrivPtr pVisualConfigsPriv;
     unsigned long agpHandle;
     unsigned long registerHandle;
-    CARD32 agpAddr;
+    unsigned long agpAddr;
     unsigned char *agpBase;
     unsigned int agpSize;
     Bool IsPCI;
diff --git a/programs/Xserver/hw/xfree86/drivers/via/via_swov.c b/programs/Xserver/hw/xfree86/drivers/via/via_swov.c
index bd79bb953..8e480a73a 100644
--- a/programs/Xserver/hw/xfree86/drivers/via/via_swov.c
+++ b/programs/Xserver/hw/xfree86/drivers/via/via_swov.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_swov.c,v 1.6tsi Exp $ */
 /*
  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
  * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -312,7 +312,7 @@ unsigned long VIAVidCreateSurface(ScrnInfoPtr pScrn, LPDDSURFACEDESC lpDDSurface
             if ( hwDiff->dwThreeHQVBuffer )    /*CLE_C0*/
             {
                 VIDOutD(HQV_DST_STARTADDR2,pVia->swov.overlayRecordV1.dwHQVAddr[2]);
-                ErrorF("000003FC %08lx\n",VIDInD(HQV_DST_STARTADDR2) );
+                ErrorF("000003FC %08lx\n", (unsigned long)VIDInD(HQV_DST_STARTADDR2) );
             }
            
             break;
@@ -564,7 +564,7 @@ if (!(pVia->swov.gdwVideoFlagSW & SW_USE_HQV))
             if ( hwDiff->dwThreeHQVBuffer )    /*CLE_C0*/
             {
                 VIDOutD(HQV_DST_STARTADDR2,pVia->swov.overlayRecordV1.dwHQVAddr[2]);
-                ErrorF("000003FC %08lx\n",VIDInD(HQV_DST_STARTADDR2) );
+                ErrorF("000003FC %08lx\n", (unsigned long)VIDInD(HQV_DST_STARTADDR2) );
             }
              
             break;
diff --git a/programs/Xserver/hw/xfree86/input/acecad/acecad.h b/programs/Xserver/hw/xfree86/input/acecad/acecad.h
index 2ab9fdce2..efb7bfb3e 100644
--- a/programs/Xserver/hw/xfree86/input/acecad/acecad.h
+++ b/programs/Xserver/hw/xfree86/input/acecad/acecad.h
@@ -23,7 +23,7 @@
  *
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.1 2001/08/13 19:35:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.2tsi Exp $ */
 
 #ifndef	_ACECAD_H_
 #define _ACECAD_H_
@@ -88,8 +88,10 @@ typedef struct
 /******************************************************************************
  *		Declarations
  *****************************************************************************/
+#ifdef XFree86LOADER
 static MODULESETUPPROTO( SetupProc );
 static void TearDownProc (void *);
+#endif
 static Bool DeviceControl (DeviceIntPtr, int);
 static Bool DeviceOn (DeviceIntPtr);
 static Bool DeviceOff (DeviceIntPtr);
diff --git a/programs/Xserver/hw/xfree86/input/citron/citron.c b/programs/Xserver/hw/xfree86/input/citron/citron.c
index a9a488f22..259e8e6bf 100644
--- a/programs/Xserver/hw/xfree86/input/citron/citron.c
+++ b/programs/Xserver/hw/xfree86/input/citron/citron.c
@@ -25,7 +25,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.c,v 1.10 2003/09/24 02:43:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.c,v 1.11tsi Exp $ */
 
 /*
  * Based, in part, on code with the following copyright notice:
@@ -596,8 +596,10 @@ xf86CitronPrint (int nr, LedCtrl *ctrl)
 {
 	DBG(8, ErrorF("%s------------------------------------------\n", CI_INFO));
 	DBG(8, ErrorF("%sxf86CitronFeedback%d(dev, ctrl)\n", CI_INFO, nr));
-	DBG(8, ErrorF("%s  ctrl->led_values.......:%ld [0x%08lX]\n", CI_INFO, ctrl->led_values, ctrl->led_values));
-	DBG(8, ErrorF("%s  ctrl->led_mask.........:%ld [0x%08lX]\n", CI_INFO, ctrl->led_mask, ctrl->led_mask));
+	DBG(8, ErrorF("%s  ctrl->led_values.......:%ld [0x%08lX]\n", CI_INFO,
+		ctrl->led_values, ctrl->led_values));
+	DBG(8, ErrorF("%s  ctrl->led_mask.........:%ld [0x%08lX]\n", CI_INFO,
+		(unsigned long)ctrl->led_mask, (unsigned long)ctrl->led_mask));
 	DBG(8, ErrorF("%s  ctrl->id...............:%d\n", CI_INFO, ctrl->id));
 }
 
@@ -745,7 +747,8 @@ cit_SuperVisionTimer(OsTimerPtr timer, CARD32 now, pointer arg)
 	cit_PrivatePtr priv = (cit_PrivatePtr) arg;
     int	sigstate;
 
-	DBG(5, ErrorF ("%scit_SuperVisionTimer called %ld\n", CI_INFO, GetTimeInMillis()));
+	DBG(5, ErrorF ("%scit_SuperVisionTimer called %ld\n", CI_INFO,
+			(unsigned long)GetTimeInMillis()));
 
     sigstate = xf86BlockSIGIO ();
 	
@@ -803,7 +806,8 @@ CitronPreInit (InputDriverPtr drv, IDevPtr dev, int flags)
 	int errmaj, errmin;
 #endif
 
-	ErrorF ("%sCitronPreInit called - xcalloc=%d\n", CI_INFO, sizeof(cit_PrivateRec));
+	ErrorF ("%sCitronPreInit called - xcalloc=%d\n", CI_INFO,
+		(int)sizeof(cit_PrivateRec));
 /*	DBG(2, ErrorF("\txf86Verbose=%d\n", xf86Verbose));*/
 	if ((!local) || (!priv))
 	{
diff --git a/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c b/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c
index 518c81c09..7a9b9b3f2 100644
--- a/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c
+++ b/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v 1.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c,v 1.37tsi Exp $ */
 
 /*
  * This driver is only able to handle the Wacom IV and Wacom V protocols.
@@ -896,7 +896,8 @@ xf86WcmSendEvents(LocalDevicePtr	local,
 		int	macro = z / 2;
 
 		DBG(6, ErrorF("macro=%d buttons=%d wacom_map[%d]=%lx\n",
-			      macro, buttons, macro, wacom_map[macro]));
+			      macro, buttons, macro,
+			      (unsigned long)wacom_map[macro]));
 
 		/* First available Keycode begins at 8 => macro+7 */
 		xf86PostKeyEvent(local->dev, macro+7, 1,
diff --git a/programs/Xserver/hw/xfree86/int10/helper_exec.c b/programs/Xserver/hw/xfree86/int10/helper_exec.c
index fc5a010b4..142177b1d 100644
--- a/programs/Xserver/hw/xfree86/int10/helper_exec.c
+++ b/programs/Xserver/hw/xfree86/int10/helper_exec.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.24 2002/11/25 21:05:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.25tsi Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -145,7 +145,7 @@ void
 dump_code(xf86Int10InfoPtr pInt)
 {
     int i;
-    CARD32 lina = SEG_ADR((CARD32), X86_CS, IP);
+    unsigned long lina = SEG_ADR((CARD32), X86_CS, IP);
 
     xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8lx:\n", lina);
     for (i=0; i<0x10; i++)
@@ -180,8 +180,8 @@ void
 stack_trace(xf86Int10InfoPtr pInt)
 {
     int i = 0;
-    CARD32 stack = SEG_ADR((CARD32), X86_SS, SP);
-    CARD32 tail  = (CARD32)((X86_SS << 4) + 0x1000);
+    unsigned long stack = SEG_ADR((CARD32), X86_SS, SP);
+    unsigned long tail  = (CARD32)((X86_SS << 4) + 0x1000);
 
     if (stack >= tail) return;
 
diff --git a/programs/Xserver/hw/xfree86/loader/elfloader.c b/programs/Xserver/hw/xfree86/loader/elfloader.c
index 438d77e8d..46172fdff 100644
--- a/programs/Xserver/hw/xfree86/loader/elfloader.c
+++ b/programs/Xserver/hw/xfree86/loader/elfloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.60tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
 
 /*
  *
@@ -2464,7 +2464,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
 
     default:
 	ErrorF("Elf_RelocateEntry() Unsupported relocation type %d\n",
-	       ELF_R_TYPE(rel->r_info));
+	       (int)ELF_R_TYPE(rel->r_info));
 	break;
     }
     return 0;
diff --git a/programs/Xserver/hw/xfree86/loader/loader.c b/programs/Xserver/hw/xfree86/loader/loader.c
index 52acf285c..27f27215b 100644
--- a/programs/Xserver/hw/xfree86/loader/loader.c
+++ b/programs/Xserver/hw/xfree86/loader/loader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.69tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.70tsi Exp $ */
 
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
@@ -346,19 +346,19 @@ LoaderInit(void)
 #endif
 
     xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
-    xf86ErrorFVerb(2, "\t%s: %ld.%ld\n", ABI_CLASS_ANSIC,
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
 		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
 		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
-    xf86ErrorFVerb(2, "\t%s: %ld.%ld\n", ABI_CLASS_VIDEODRV,
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,
 		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
 		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
-    xf86ErrorFVerb(2, "\t%s : %ld.%ld\n", ABI_CLASS_XINPUT,
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,
 		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
 		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
-    xf86ErrorFVerb(2, "\t%s : %ld.%ld\n", ABI_CLASS_EXTENSION,
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
 		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
 		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
-    xf86ErrorFVerb(2, "\t%s : %ld.%ld\n", ABI_CLASS_FONT,
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_FONT,
 		   GET_ABI_MAJOR(LoaderVersionInfo.fontVersion),
 		   GET_ABI_MINOR(LoaderVersionInfo.fontVersion));
 
diff --git a/programs/Xserver/hw/xfree86/loader/loader.h b/programs/Xserver/hw/xfree86/loader/loader.h
index 0f73f990f..78561f759 100644
--- a/programs/Xserver/hw/xfree86/loader/loader.h
+++ b/programs/Xserver/hw/xfree86/loader/loader.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.26 2003/08/24 17:37:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.27tsi Exp $ */
 
 /*
  *
@@ -218,12 +218,12 @@ typedef struct _loader {
 
 /* Compiled-in version information */
 typedef struct {
-    INT32 xf86Version;
-    INT32 ansicVersion;
-    INT32 videodrvVersion;
-    INT32 xinputVersion;
-    INT32 extensionVersion;
-    INT32 fontVersion;
+    int xf86Version;
+    int ansicVersion;
+    int videodrvVersion;
+    int xinputVersion;
+    int extensionVersion;
+    int fontVersion;
 } ModuleVersions;
 extern ModuleVersions LoaderVersionInfo;
 
diff --git a/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c b/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
index 87e4ff3e0..df7826a07 100644
--- a/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
+++ b/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.4tsi Exp $ */
 /*
  * Copyright (C) 2002-2003 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -391,14 +391,15 @@ GetZX1BridgeResources(int bus,
 static CARD32
 zx1FakeReadLong(PCITAG tag, int offset)
 {
-    FatalError("zx1FakeReadLong(0x%X, 0x%X) called\n", tag, offset);
+    FatalError("zx1FakeReadLong(0x%lX, 0x%X) called\n",
+	       (unsigned long)tag, offset);
 }
 
 static void
 zx1FakeWriteLong(PCITAG tag, int offset, CARD32 val)
 {
-    FatalError("zx1FakeWriteLong(0x%X, 0x%X, 0x%08X) called\n",
-	       tag, offset, val);
+    FatalError("zx1FakeWriteLong(0x%lX, 0x%X, 0x%08X) called\n",
+	       (unsigned long)tag, offset, val);
 }
 
 static void
diff --git a/programs/Xserver/hw/xfree86/vbe/vbeModes.c b/programs/Xserver/hw/xfree86/vbe/vbeModes.c
index 7c38bf5e4..b3951f8f9 100644
--- a/programs/Xserver/hw/xfree86/vbe/vbeModes.c
+++ b/programs/Xserver/hw/xfree86/vbe/vbeModes.c
@@ -27,7 +27,7 @@
  *
  * Authors: David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.2tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $
  */
 
 #include "xf86.h"
@@ -261,7 +261,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
 	    xf86ErrorFVerb(DEBUG_VERB,
 		    "	LinRsvdFieldPosition: %d\n", mode->LinRsvdFieldPosition);
 	    xf86ErrorFVerb(DEBUG_VERB,
-		    "	MaxPixelClock: %ld\n", mode->MaxPixelClock);
+		    "	MaxPixelClock: %ld\n", (unsigned long)mode->MaxPixelClock);
 	}
     }
 
diff --git a/programs/Xserver/randr/randr.c b/programs/Xserver/randr/randr.c
index 9bb3feaa6..b253ddbab 100644
--- a/programs/Xserver/randr/randr.c
+++ b/programs/Xserver/randr/randr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.20tsi Exp $
+ * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $
  *
  * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
@@ -538,7 +538,7 @@ ProcRRGetScreenInfo (ClientPtr client)
     ScreenPtr		    pScreen;
     rrScrPrivPtr	    pScrPriv;
     CARD8		    *extra;
-    int			    extraLen;
+    unsigned long	    extraLen;
 
     REQUEST_SIZE_MATCH(xRRGetScreenInfoReq);
     pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client,
@@ -660,8 +660,8 @@ ProcRRGetScreenInfo (ClientPtr client)
 	data8 = (CARD8 *) rates;
 
 	if (data8 - (CARD8 *) extra != extraLen)
-	    FatalError ("RRGetScreenInfo bad extra len %d != %d\n",
-			data8 - (CARD8 *) extra, extraLen);
+	    FatalError ("RRGetScreenInfo bad extra len %ld != %ld\n",
+			(unsigned long)(data8 - (CARD8 *) extra), extraLen);
 	rep.length =  (extraLen + 3) >> 2;
     }
     if (client->swapped) {
diff --git a/programs/Xserver/xkb/xkb.c b/programs/Xserver/xkb/xkb.c
index de2009e44..7a0cde8ad 100644
--- a/programs/Xserver/xkb/xkb.c
+++ b/programs/Xserver/xkb/xkb.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.19 2003/07/16 01:39:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.20tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -1502,8 +1502,8 @@ char		*desc,*start;
     if ( rep->totalVModMapKeys>0 )
 	desc= XkbWriteVirtualModMap(xkb,rep,desc,client);
     if ((desc-start)!=(len)) {
-	ErrorF("BOGUS LENGTH in write keyboard desc, expected %d, got %d\n",
-					len, desc-start);
+	ErrorF("BOGUS LENGTH in write keyboard desc, expected %d, got %ld\n",
+					len, (unsigned long)(desc-start));
     }
     if (client->swapped) {
 	register int n;
@@ -3858,8 +3858,8 @@ char *			desc;
 	desc+= rep->nRadioGroups*4;
     }
     if ((desc-start)!=(length)) {
-	ErrorF("BOGUS LENGTH in write names, expected %d, got %d\n",
-					length, desc-start);
+	ErrorF("BOGUS LENGTH in write names, expected %d, got %ld\n",
+					length, (unsigned long)(desc-start));
     }
     WriteToClient(client, SIZEOF(xkbGetNamesReply), (char *)rep);
     WriteToClient(client, length, start);
@@ -4922,8 +4922,8 @@ XkbSendGeometry(client,geom,rep,freeGeom)
 	if ( rep->nKeyAliases>0 )
 	    desc = XkbWriteGeomKeyAliases(desc,geom,client->swapped);
 	if ((desc-start)!=(len)) {
-	    ErrorF("BOGUS LENGTH in XkbSendGeometry, expected %d, got %d\n",
-							len, desc-start);
+	    ErrorF("BOGUS LENGTH in XkbSendGeometry, expected %d, got %ld\n",
+			len, (unsigned long)(desc-start));
 	}
     }
     else {