From 63a788caa35b080bde1307fc6d5715dec091fe38 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 2 Jul 2010 12:44:32 +0000
Subject: git update 2/7/2010

---
 xorg-server/include/privates.h | 2 +-
 xorg-server/include/xkbsrv.h   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'xorg-server/include')

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"
 
-- 
cgit v1.2.3