aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-08 15:07:46 +0200
committermarha <marha@users.sourceforge.net>2014-06-08 15:07:46 +0200
commitb5a2c971202ff19079cb5a98253d8760ae124d15 (patch)
tree451469af3bf1c7d9ce0236ba546867bbf6a2fb3a /X11/extensions
parent71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (diff)
parentd435b20322433b335a4fc5693cce0399a3f27b2d (diff)
downloadvcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.gz
vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.bz2
vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/Xwindows.h
Diffstat (limited to 'X11/extensions')
-rw-r--r--X11/extensions/XI2.h2
-rw-r--r--X11/extensions/XIproto.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/X11/extensions/XI2.h b/X11/extensions/XI2.h
index b1498a755..5a1c66a94 100644
--- a/X11/extensions/XI2.h
+++ b/X11/extensions/XI2.h
@@ -234,7 +234,7 @@
#define XI_RawMotionMask (1 << XI_RawMotion)
#define XI_TouchBeginMask (1 << XI_TouchBegin)
#define XI_TouchEndMask (1 << XI_TouchEnd)
-#define XI_TouchOwnershipChangedMask (1 << XI_TouchOwnershipChanged)
+#define XI_TouchOwnershipChangedMask (1 << XI_TouchOwnership)
#define XI_TouchUpdateMask (1 << XI_TouchUpdate)
#define XI_RawTouchBeginMask (1 << XI_RawTouchBegin)
#define XI_RawTouchEndMask (1 << XI_RawTouchEnd)
diff --git a/X11/extensions/XIproto.h b/X11/extensions/XIproto.h
index e00ab61dc..82323d899 100644
--- a/X11/extensions/XIproto.h
+++ b/X11/extensions/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;
};
/*********************************************************