xfree86: parser: rename IOBASE for fixing name conflict
Resolve conflicts with OS headers definining IOBASE by renaming the IOBASE enum value to XF86_TOKEN_IOBASE. This way, don't need the special #undef hack anymore. Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1405>
This commit is contained in:
parent
a1fa019012
commit
584bbe9988
|
@ -75,7 +75,7 @@ static const xf86ConfigSymTabRec DeviceTab[] = {
|
||||||
{VIDEORAM, "videoram"},
|
{VIDEORAM, "videoram"},
|
||||||
{BIOSBASE, "biosbase"},
|
{BIOSBASE, "biosbase"},
|
||||||
{MEMBASE, "membase"},
|
{MEMBASE, "membase"},
|
||||||
{IOBASE, "iobase"},
|
{XF86_TOKEN_IOBASE, "iobase"},
|
||||||
{CLOCKCHIP, "clockchip"},
|
{CLOCKCHIP, "clockchip"},
|
||||||
{CHIPID, "chipid"},
|
{CHIPID, "chipid"},
|
||||||
{CHIPREV, "chiprev"},
|
{CHIPREV, "chiprev"},
|
||||||
|
@ -181,7 +181,7 @@ xf86parseDeviceSection(void)
|
||||||
Error(NUMBER_MSG, "MemBase");
|
Error(NUMBER_MSG, "MemBase");
|
||||||
ptr->dev_mem_base = xf86_lex_val.num;
|
ptr->dev_mem_base = xf86_lex_val.num;
|
||||||
break;
|
break;
|
||||||
case IOBASE:
|
case XF86_TOKEN_IOBASE:
|
||||||
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
|
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
|
||||||
Error(NUMBER_MSG, "IOBase");
|
Error(NUMBER_MSG, "IOBase");
|
||||||
ptr->dev_io_base = xf86_lex_val.num;
|
ptr->dev_io_base = xf86_lex_val.num;
|
||||||
|
|
|
@ -59,9 +59,6 @@
|
||||||
#ifndef _xf86_tokens_h
|
#ifndef _xf86_tokens_h
|
||||||
#define _xf86_tokens_h
|
#define _xf86_tokens_h
|
||||||
|
|
||||||
/* Undefine symbols that some OSs might define */
|
|
||||||
#undef IOBASE
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Each token should have a unique value regardless of the section
|
* Each token should have a unique value regardless of the section
|
||||||
* it is used in.
|
* it is used in.
|
||||||
|
@ -169,7 +166,7 @@ typedef enum {
|
||||||
CLOCKS,
|
CLOCKS,
|
||||||
VIDEORAM,
|
VIDEORAM,
|
||||||
BOARD,
|
BOARD,
|
||||||
IOBASE,
|
XF86_TOKEN_IOBASE,
|
||||||
RAMDAC,
|
RAMDAC,
|
||||||
DACSPEED,
|
DACSPEED,
|
||||||
BIOSBASE,
|
BIOSBASE,
|
||||||
|
|
Loading…
Reference in New Issue