Index: xf86_OSlib.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v
retrieving revision 1.5
diff -u -r1.5 xf86_OSlib.h
--- xf86_OSlib.h	2 Mar 2005 11:20:29 -0000	1.5
+++ xf86_OSlib.h	4 Apr 2005 00:53:38 -0000
@@ -255,9 +255,15 @@
 
 # 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