diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-04-17 12:10:22 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-04-17 12:10:22 -0400 |
| commit | 1f06d32ef58749d0f0c062193d237ee98f60e90f (patch) | |
| tree | 6130443e4804582e79b5000949bfdd186da44ed1 /include/input.h | |
| parent | cf962a849db2b259ca558c6265ea7e3328a4d312 (diff) | |
| parent | fc162c6cfa06f0b012743d6d79cef45cf0166229 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/privates.c
Diffstat (limited to 'include/input.h')
| -rw-r--r-- | include/input.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h index 2350a2456..97a78567f 100644 --- a/include/input.h +++ b/include/input.h @@ -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, |