andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input: move CorePointer/KeyboardProc declarations into header.

Browse Source 
The extern declaration in xichangehierarchy.c was broken anyway.
This fixes a crash on creating a new master device.

Reported-by: Maxim Levitsky
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-08-24 09:21:03 +10:00
parent b968237131
commit 80f18a7326
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xi/xichangehierarchy.c
View File

@ -54,10 +54,6 @@
#include "xichangehierarchy.h"
extern DeviceProc CorePointerProc;
extern DeviceProc CoreKeyboardProc;
/**
* Send the current state of the device hierarchy to all clients.
*/

3
dix/devices.c
View File

@ -98,9 +98,6 @@ DevPrivateKey UnusedClassesPrivateKey = &UnusedClassesPrivateKeyIndex;
static int XTstDevicePrivateKeyIndex;
DevPrivateKey XTstDevicePrivateKey = &XTstDevicePrivateKeyIndex;
int CorePointerProc(DeviceIntPtr, int);
int CoreKeyboardProc(DeviceIntPtr, int);
/**
* vxtstpointer
* is the virtual pointer for XTest. It is the first slave

3
include/dix.h
View File

@ -586,6 +586,9 @@ extern Bool IsKeyboardDevice(DeviceIntPtr dev);
extern Bool IsPointerEvent(InternalEvent *event);
extern Bool IsMaster(DeviceIntPtr dev);
extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
/*
* These are deprecated compatibility functions and will be removed soon!