[PATCH 1/2] xfree86: Revert 'Remove constants supposedly for isc cc.', add note.

Matt Turner mattst88 at gmail.com
Sun Aug 1 19:25:56 PDT 2010


On Sun, Aug 1, 2010 at 10:05 PM, Jesse Adkins <jesserayadkins at gmail.com> wrote:
> Turns out the keyboard driver relies on these.
> Added a note about who uses the macros, so this doesn't happen again.
>
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/common/xf86Privstr.h |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
> index f2f3f11..9fd8120 100644
> --- a/hw/xfree86/common/xf86Privstr.h
> +++ b/hw/xfree86/common/xf86Privstr.h
> @@ -145,6 +145,17 @@ typedef struct _RootWinProp {
>     pointer                    data;
>  } RootWinProp, *RootWinPropPtr;
>
> +/* Information for the keyboard driver. */
> +/* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
> +#define XLED1   ((unsigned long) 0x00000001)
> +#define XLED2   ((unsigned long) 0x00000002)
> +#define XLED3   ((unsigned long) 0x00000004)
> +#define XLED4  ((unsigned long) 0x00000008)
> +#define XCAPS   ((unsigned long) 0x20000000)
> +#define XNUM    ((unsigned long) 0x40000000)
> +#define XSCR    ((unsigned long) 0x80000000)
> +#define XCOMP  ((unsigned long) 0x00008000)
> +
>  /* BSD console driver types (consType) */
>  #if defined(CSRG_BASED) || defined(__FreeBSD_kernel__)
>  #define PCCONS            0
> --
> 1.7.0.4

I don't think the other patch has been committed, so a revert doesn't help.

Just remove the patch that this one would revert from your pull
request and resend (I guess with part of this patch adding the
comment.)

Matt


More information about the xorg-devel mailing list