[PATCH] inputproto: Allow library users to avoid having the 'Pointer' typedef declared

Keith Packard keithp at keithp.com
Mon Dec 16 09:46:01 PST 2013


'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 at keithp.com>
---
 XIproto.h | 6 ++++--
 1 file 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;
     };
 
 /*********************************************************
-- 
1.8.5.1



More information about the xorg-devel mailing list