summaryrefslogtreecommitdiff
path: root/Xi/setmmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xi/setmmap.c')
-rw-r--r--Xi/setmmap.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 16f3373a8..4c4d19c8b 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
/********************************************************************
*
@@ -59,12 +60,12 @@ SOFTWARE.
#include "inputstr.h" /* DeviceIntPtr */
#include "XI.h"
#include "XIproto.h"
+#include "exevents.h"
+#include "extnsionst.h"
+#include "extinit.h" /* LookupDeviceIntRec */
+#include "exglobals.h"
-extern int IReqCode;
-extern int BadDevice;
-extern int DeviceMappingNotify;
-extern void (* ReplySwapVector[256]) ();
-DeviceIntPtr LookupDeviceIntRec();
+#include "setmmap.h"
/***********************************************************************
*
@@ -90,6 +91,7 @@ SProcXSetDeviceModifierMapping(client)
*
*/
+int
ProcXSetDeviceModifierMapping(client)
ClientPtr client;
{
@@ -116,7 +118,7 @@ ProcXSetDeviceModifierMapping(client)
ret = SetModifierMapping(client, dev, stuff->length,
(sizeof (xSetDeviceModifierMappingReq)>>2), stuff->numKeyPerModifier,
- &stuff[1], &kp);
+ (BYTE *)&stuff[1], &kp);
if (ret==MappingSuccess || ret==MappingBusy || ret==MappingFailed)
{
@@ -143,6 +145,7 @@ ProcXSetDeviceModifierMapping(client)
*
*/
+void
SRepXSetDeviceModifierMapping (client, size, rep)
ClientPtr client;
int size;