diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-04-15 23:34:39 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-04-15 23:34:39 +0000 |
| commit | 4f686f158b00478a3d074128f9e4cb6dc0d928cd (patch) | |
| tree | 1dd34472212d226526edf112bd24b60c44d09eda /hw | |
| parent | 7472fcfdd40e29cd2847e45d4bd2dd11ccc41ff5 (diff) | |
//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>.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSlib.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 0147ccd94..85877bbe6 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -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 |