diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-22 14:30:28 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-27 11:38:38 -0800 |
| commit | 7ddef4f7033c10b6e92866182d4475a4d49c5083 (patch) | |
| tree | 5e667f8484565eeadd21a78763db1920524b1be8 /include | |
| parent | 0b5a87f37d5dcd2ebff977a3b9a50a75ace93c83 (diff) | |
Add _XITYPEDEF_POINTER to dix-config.h
Just like the pointer type from Xdefs.h, the Pointer type from
XIproto.h collides with local declarations of variables using the same
name. XIproto.h can use _XITYPEDEF_POINTER to avoid declaring the
unnecessary pointer type.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 55cfe4710..30456cbae 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -472,6 +472,9 @@ /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 +/* Don't let XIproto define 'Pointer' */ +#define _XITYPEDEF_POINTER 1 + /* Ask fontsproto to make font path element names const */ #define FONT_PATH_ELEMENT_NAME_CONST 1 |