diff options
author | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
commit | 579eaaac4679bf78b1d987a56f4a24e7cf616368 (patch) | |
tree | 53977d03cd6af212b3605ae3906d5e499e6d960e /xorg-server/include/dix.h | |
parent | bc5113fca69c8b05861a011426a4611985495cfe (diff) | |
parent | d621ea397a3d181e7a0bf07d72bd21e116fccdb8 (diff) | |
download | vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.gz vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.bz2 vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/dix.h')
-rw-r--r-- | xorg-server/include/dix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index e5a0d5c51..ac19a9536 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -401,7 +401,7 @@ extern _X_EXPORT void WindowHasNewCursor( extern Bool CheckDeviceGrabs(
DeviceIntPtr /* device */,
DeviceEvent* /* event */,
- int /* checkFirst */);
+ WindowPtr /* ancestor */);
extern void DeliverFocusedEvent(
DeviceIntPtr /* keybd */,
|