summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Xinput.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-26 14:15:04 +1000
committerPeter Hutterer <peter.hutterer@redhat.com>2008-12-02 15:50:38 +1000
commitd507f60689f4e14383b0d24e63afc8cf836360d5 (patch)
tree075fb14c8af08737f61a2e502a45fc4538083aa7 /hw/xfree86/common/xf86Xinput.h
parent9bf761468fa3baf4c5fa40efa717b4b581d920f9 (diff)
xfree86: don't FatalError on "too many input devices".
Just ignore devices after MAXDEVICES has been reached, but warn the user that the devices are ignored. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.h')
-rw-r--r--hw/xfree86/common/xf86Xinput.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index d7f50e082..bfd7f895c 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -169,7 +169,7 @@ void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
...);
void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
int is_down);
-void xf86ActivateDevice(LocalDevicePtr local);
+int xf86ActivateDevice(LocalDevicePtr local);
LocalDevicePtr xf86FirstLocalDevice(void);
int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow);
void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y);