--- src/unix/osd_cpu.h.orig	2004-04-20 14:30:49.000000000 -0700
+++ src/unix/osd_cpu.h	2004-04-20 14:31:48.000000000 -0700
@@ -38,7 +38,7 @@
 #endif
 #endif
 
-#ifndef __ARCH_solaris
+#if !defined __ARCH_solaris && !defined xgl
 /* grrr work around some stupid header conflicts */
 #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
 typedef signed   char      INT8;