config/cf/xorg.cf                                      |    2 +-
 programs/Xserver/fb/fbmmx.c                            |   14 ++++++++------
 programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c |    2 +-
 programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h |    3 ---
 4 files changed, 10 insertions(+), 11 deletions(-)

--- X11-6.8.2/xc/config/cf/xorg.cf.orig	2005-03-21 19:11:42.000000000 +0100
+++ X11-6.8.2/xc/config/cf/xorg.cf	2005-03-21 23:03:46.000000000 +0100
@@ -1541,7 +1541,7 @@
 #  if defined(UseInstalled)
 #   define DefaultCCOptions /* -ansi */
 #  else
-#   define DefaultCCOptions -ansi -pedantic GccWarningOptions
+#   define DefaultCCOptions -std=gnu9x -pedantic GccWarningOptions
 #  endif
 # endif
 # if defined(UseInstalled)
--- X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c.orig	2004-07-22 21:24:50.000000000 +0200
+++ X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c	2005-02-15 10:32:50.573357352 +0100
@@ -27,6 +27,8 @@
 
 #ifdef USE_GCC34_MMX
 
+#include <mmintrin.h>
+
 #ifdef RENDER
 
 #include "picturestr.h"
@@ -33,10 +34,10 @@
 #include "mipict.h"
 #include "fbpict.h"
 
-typedef int Vector1x64 __attribute__ ((mode(DI)));
-typedef int Vector2x32 __attribute__ ((mode(V2SI)));
-typedef int Vector4x16 __attribute__ ((mode(V4HI)));
-typedef int Vector8x8  __attribute__ ((mode(V8QI)));
+typedef __m64 Vector1x64;
+typedef __v2si Vector2x32;
+typedef __v4hi Vector4x16;
+typedef __v8qi Vector8x8;
 
 typedef unsigned long long ullong;
 
@@ -92,9 +93,9 @@
 shift (Vector1x64 v, int s)
 {
     if (s > 0)
-	return __builtin_ia32_psllq (v, s);
+	return (Vector1x64)__builtin_ia32_psllq ((ullong)v, (ullong)s);
     else if (s < 0)
-	return __builtin_ia32_psrlq (v, -s);
+	return (Vector1x64)__builtin_ia32_psrlq ((ullong)v, (ullong)-s);
     else
 	return v;
 }
--- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig	2004-08-03 11:38:03.000000000 +0200
+++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h	2005-03-31 14:20:45.000000000 +0200
@@ -146,9 +146,6 @@
 extern Bool                 RADEONProbe
 			    FunctionPrototype((DriverPtr, int));
 
-extern SymTabRec            RADEONChipsets[];
-extern PciChipsets          RADEONPciChipsets[];
-
 /* radeon_driver.c */
 extern void                 RADEONLoaderRefSymLists
 			    FunctionPrototype((void));
--- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c.orig	2004-08-12 03:03:06.000000000 +0200
+++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c	2005-03-31 14:20:34.000000000 +0200
@@ -51,7 +51,7 @@
 
 #include "radeon_chipset.h"
 
-PciChipsets RADEONPciChipsets[] = {
+static PciChipsets RADEONPciChipsets[] = {
     { PCI_CHIP_RADEON_QD, PCI_CHIP_RADEON_QD, RES_SHARED_VGA },
     { PCI_CHIP_RADEON_QE, PCI_CHIP_RADEON_QE, RES_SHARED_VGA },
     { PCI_CHIP_RADEON_QF, PCI_CHIP_RADEON_QF, RES_SHARED_VGA },