Jesse Adkins wrote:
> Since one of the tokens was XLEDS, the unused XLEDS message was also removed.
> Signed-off-by: Jesse Adkins <[email protected]>
> ---
> hw/xfree86/parser/Configint.h | 2 --
> hw/xfree86/parser/xf86tokens.h | 31 -------------------------------
> 2 files changed, 0 insertions(+), 33 deletions(-)
>
> diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h
> index dda020e..05e40f6 100644
> --- a/hw/xfree86/parser/Configint.h
> +++ b/hw/xfree86/parser/Configint.h
> @@ -154,8 +154,6 @@ else\
> "The ZAxisMapping keyword requires 2 positive numbers or X or Y to follow
> it."
> #define AUTOREPEAT_MSG \
> "The AutoRepeat keyword requires 2 numbers (delay and rate) to follow it."
> -#define XLEDS_MSG \
> -"The XLeds keyword requries one or more numbers to follow it."
> #define DACSPEED_MSG \
> "The DacSpeed keyword must be followed by a list of up to %d numbers."
> #define DISPLAYSIZE_MSG \
> diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
> index be35f36..83ff016 100644
> --- a/hw/xfree86/parser/xf86tokens.h
> +++ b/hw/xfree86/parser/xf86tokens.h
> @@ -191,37 +191,6 @@ typedef enum {
> TEXTCLOCKFRQ,
> IRQ,
>
> - /* Keyboard tokens */
> - AUTOREPEAT,
> - XLEDS,
> - KPROTOCOL,
> - XKBKEYMAP,
> - XKBCOMPAT,
> - XKBTYPES,
> - XKBKEYCODES,
> - XKBGEOMETRY,
> - XKBSYMBOLS,
> - XKBDISABLE,
> - PANIX106,
> - XKBRULES,
> - XKBMODEL,
> - XKBLAYOUT,
> - XKBVARIANT,
> - XKBOPTIONS,
> - /* Obsolete keyboard tokens */
> - SERVERNUM,
> - LEFTALT,
> - RIGHTALT,
> - SCROLLLOCK_TOK,
> - RIGHTCTL,
> - /* arguments for the above obsolete tokens */
> - CONF_KM_META,
> - CONF_KM_COMPOSE,
> - CONF_KM_MODESHIFT,
> - CONF_KM_MODELOCK,
> - CONF_KM_SCROLLLOCK,
> - CONF_KM_CONTROL,
> -
> /* Pointer tokens */
> EMULATE3,
> BAUDRATE,
Looks like an ABI break, unless you set EMULATE3 to be equal to the
old value and just leave the space between unused (it's not like this
saves much, we're nowhere near running out of ints).
--
-Alan Coopersmith- [email protected]
Oracle Solaris Platform Engineering: X Window System
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
