aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 06:40:50 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 06:40:50 +0000
commit619d6f3626f36af85cc40eeee95c7585d906fe5c (patch)
tree0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/hw/xquartz
parentd89c0289565a662a378df6e3c05de42982ab1c9d (diff)
parent80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff)
downloadvcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz
vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2
vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz')
-rw-r--r--xorg-server/hw/xquartz/darwinXinput.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index cba2853a3..54ba2032a 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -245,7 +245,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
*
*/
void
-DeleteInputDeviceRequest(DeviceIntPtr dev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr dev)
{
DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
}