diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
| commit | 1d46380a9bb69897acdadf71b80cd759b0493fad (patch) | |
| tree | d8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /xorg-server/include | |
| parent | 18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff) | |
| parent | 293fd0043af7e861c9c540bebc44630d0da0bf9b (diff) | |
| download | vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2 vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 18 oct 2012
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/inpututils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h index cd9a4de82..53c96ba1c 100644 --- a/xorg-server/include/inpututils.h +++ b/xorg-server/include/inpututils.h @@ -57,6 +57,7 @@ XI2Mask *xi2mask_new(void); XI2Mask *xi2mask_new_with_size(size_t, size_t); /* don't use it */ void xi2mask_free(XI2Mask **mask); Bool xi2mask_isset(XI2Mask *mask, const DeviceIntPtr dev, int event_type); +Bool xi2mask_isset_for_device(XI2Mask *mask, const DeviceIntPtr dev, int event_type); void xi2mask_set(XI2Mask *mask, int deviceid, int event_type); void xi2mask_zero(XI2Mask *mask, int deviceid); void xi2mask_merge(XI2Mask *dest, const XI2Mask *source); |