From 7ddef4f7033c10b6e92866182d4475a4d49c5083 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 22 Jan 2014 14:30:28 -0800 Subject: [PATCH] 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 Reviewed-by: Eric Anholt --- include/dix-config.h.in | 3 +++ 1 file changed, 3 insertions(+) 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