mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/privates.c
This commit is contained in:
@@ -444,7 +444,10 @@ extern DeviceIntPtr LookupDeviceIntRec(
|
||||
|
||||
/* Implemented by the DDX. */
|
||||
extern int NewInputDeviceRequest(
|
||||
InputOption *options);
|
||||
InputOption *options,
|
||||
DeviceIntPtr *dev);
|
||||
extern void DeleteInputDeviceRequest(
|
||||
DeviceIntPtr dev);
|
||||
|
||||
extern void DDXRingBell(
|
||||
int volume,
|
||||
|
||||
Reference in New Issue
Block a user