diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-02 14:40:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-02 14:40:53 +0000 |
| commit | bb10a5eb99178daa575d5365c8588d891e9988be (patch) | |
| tree | 8116bb4cbcf79d17b3ae6f4946cd547d14b979ed /xorg-server/include | |
| parent | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (diff) | |
| parent | 63a788caa35b080bde1307fc6d5715dec091fe38 (diff) | |
| download | vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.tar.gz vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.tar.bz2 vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/privates.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 6 |
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 ce29a8150..f0b0b25fa 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"
|