aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-02 12:44:32 +0000
committermarha <marha@users.sourceforge.net>2010-07-02 12:44:32 +0000
commit63a788caa35b080bde1307fc6d5715dec091fe38 (patch)
treef7933fca9786afbf1efc31751a94a9a6c897502b /xorg-server/include
parent87559ccfc67a98a75fa8068066871c35caa88e30 (diff)
downloadvcxsrv-63a788caa35b080bde1307fc6d5715dec091fe38.tar.gz
vcxsrv-63a788caa35b080bde1307fc6d5715dec091fe38.tar.bz2
vcxsrv-63a788caa35b080bde1307fc6d5715dec091fe38.zip
git update 2/7/2010
Diffstat (limited to 'xorg-server/include')
-rw-r--r--xorg-server/include/privates.h2
-rw-r--r--xorg-server/include/xkbsrv.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h
index 2774776ab..9b578e467 100644
--- a/xorg-server/include/privates.h
+++ b/xorg-server/include/privates.h
@@ -177,7 +177,7 @@ static inline pointer *
dixLookupPrivateAddr(PrivatePtr *privates, const DevPrivateKey key)
{
assert (key->size == 0);
- return dixGetPrivateAddr(privates, key);
+ return (pointer *)dixGetPrivateAddr(privates, key);
}
/*
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index bd342a351..a7f17d44c 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -927,6 +927,12 @@ extern int XkbGetEffectiveGroup(
extern void XkbMergeLockedPtrBtns(
DeviceIntPtr /* master */);
+extern void XkbFakeDeviceButton(
+ DeviceIntPtr /* dev */,
+ int /* press */,
+ int /* button */);
+
+
#include "xkbfile.h"
#include "xkbrules.h"