summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-16 09:43:41 -0800
committerKeith Packard <keithp@keithp.com>2014-03-10 09:58:56 -0700
commitb4184619702b6801e3a2ea9733ae1620fa4ceda7 (patch)
tree31a31943fc0b3b7fbe5fab93bb5c2dbb2c195336
parent3c1ebd1cfe71029ebc6a732a6b55308861e549e0 (diff)
downloadxorg-proto-inputproto-b4184619702b6801e3a2ea9733ae1620fa4ceda7.tar.gz
inputproto: Allow library users to avoid having the 'Pointer' typedef declared
'Pointer' collides with too many other application names, so stop using it locally and allow applications to avoid having it in the API. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--XIproto.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/XIproto.h b/XIproto.h
index e00ab61..82323d8 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -85,12 +85,14 @@ typedef struct _XExtEventInfo
BYTE word;
} XExtEventInfo;
-typedef unsigned char *Pointer;
+#ifndef _XITYPEDEF_POINTER
+typedef void *Pointer;
+#endif
struct tmask
{
Mask mask;
- Pointer dev;
+ void *dev;
};
/*********************************************************