--- xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi_accel.h.orig	2005-04-03 13:10:03.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi_accel.h	2005-04-03 13:08:47.000000000 +0200
@@ -117,8 +117,6 @@
 
 #define BandSize 		0x10
 
-typedef unsigned long ulong ;
-
 unsigned long    r_port, w_port ;
 
 int     G2CmdQueLen;
@@ -133,7 +131,7 @@
 
 #define Volari_Idle \
     {\
-        ulong ulTemp ;\
+        unsigned long ulTemp ;\
 \
         do \
         {\
@@ -480,7 +478,7 @@
 ***********************************************************************/
 
 #define Volari_SetupDSTColorDepth(bpp) \
-    pXGI->CommandReg |= ((ulong)(bpp))&(GENMASK(17:16)) ;
+    pXGI->CommandReg |= ((unsigned long)(bpp))&(GENMASK(17:16)) ;
 
 /***********************************************************************
 #define Volari_SetupRect(w,h) \