xorg-x11-proto-devel/inputproto-0001-Allow-library-users-to-avoid-having-the-P.patch

40 lines
999 B
Diff
Raw Normal View History

From b4184619702b6801e3a2ea9733ae1620fa4ceda7 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 16 Dec 2013 09:43:41 -0800
Subject: [PATCH] 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>
---
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.9.0