Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.875
diff -u -2 -0 -r1.875 ChangeLog
--- xc/ChangeLog	15 Apr 2005 00:18:58 -0000	1.875
+++ xc/ChangeLog	15 Apr 2005 23:20:35 -0000
@@ -1,20 +1,28 @@
+2005-04-15 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
+	bugzilla #2885 (https://bugs.freedesktop.org/show_bug.cgi?id=2885)
+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx)
+	Fix Solaris build bustage caused by namespace collision between symbols
+	defined in <sys/kbd.h> and those in "xf86_OSlib.h".
+	Patch by Alan Coopersmith  <alan.coopersmith@sun.com>.
+
 2005-04-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c:
 	Bug #2141: Rework misleading warning message when APM support is
 	unavailable.
 
 2005-04-14 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c
 	Fix initial DDC parameters when validating modes.
 
 2005-04-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/cfb/cfbgc.c:
 	Bug #3025: gcc4 build fix.
 
 2005-04-14  Felix Kuehling  <fxkuehl@gmx.de>
 
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c:
 	(SavagePreInit):
 	User reports indicate that both command and vertex DMA on
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v
retrieving revision 1.5
diff -u -2 -0 -r1.5 xf86_OSlib.h
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	2 Mar 2005 11:20:29 -0000	1.5
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	15 Apr 2005 23:22:13 -0000
@@ -238,43 +238,49 @@
 #   define NEED_STRERROR
 #  endif
 # endif
 
 #endif /* (SYSV || SVR4) && !DGUX */
 
 /**********
  * Good ol' Solaris8, and its lack of VT support 
  ***********/
 
 #if defined(__SOL8__) || (defined(sun) && !defined(i386))
 # include <sys/mman.h>
 # include <errno.h>
 # ifdef i386
 #  include <sys/sysi86.h>
 # endif
 # include <sys/psw.h>
 
 # include <termio.h>
 # include <sys/fbio.h>
-# include <sys/kbd.h>
+# include <sys/kbd.h> 
 # include <sys/kbio.h>
 
+/* undefine symbols from <sys/kbd.h> we don't need that conflict with enum
+   definitions in parser/xf86tokens.h */
+#undef STRING
+#undef LEFTALT
+#undef RIGHTALT
+
 # define LED_CAP LED_CAPS_LOCK
 # define LED_NUM LED_NUM_LOCK
 # define LED_SCR LED_SCROLL_LOCK
 # define LED_COMP LED_COMPOSE
 
 # include <signal.h>
 
 #endif /* __SOL8__ */
 
 
 
 /**************************************************************************/
 /* DG/ux R4.20MU03 Intel AViion Machines                                  */
 /**************************************************************************/
 #if defined(DGUX) && defined(SVR4)
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <ctype.h>
 #include <termios.h>      /* Use termios for BSD Flavor ttys */
 #include <sys/termios.h>