frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//bugs.freedesktop.org/show_bug.cgi?id=2885) attachment #2434 

(https://bugs.freedesktop.org/attachment.cgi?id=2434) 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>.
This commit is contained in:
Roland Mainz 2005-04-15 23:34:39 +00:00
parent 7472fcfdd4
commit 4f686f158b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -67,7 +67,7 @@
*/
/* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 1.4 2004/07/28 03:57:19 alanc Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 1.5 2005/03/02 11:20:29 gisburn Exp $ */
/*
* This is private, and should not be included by any drivers. Drivers
@ -255,9 +255,15 @@ typedef signed long xf86ssize_t;
# 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