diff options
author | marha <marha@users.sourceforge.net> | 2011-12-16 20:49:54 +0100 |
---|---|---|
committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:46:08 +0100 |
commit | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (patch) | |
tree | 451bee4796d3058f90af4e66f2cfbdfbe6c77bfe /xorg-server/include/exevents.h | |
parent | 64718ba8bdcecd8d736a48239847b1f9aadd40ea (diff) | |
parent | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (diff) | |
download | vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.gz vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.bz2 vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
Diffstat (limited to 'xorg-server/include/exevents.h')
-rw-r--r-- | xorg-server/include/exevents.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/include/exevents.h b/xorg-server/include/exevents.h index 12ea37885..0ab04f525 100644 --- a/xorg-server/include/exevents.h +++ b/xorg-server/include/exevents.h @@ -159,7 +159,7 @@ typedef struct _XIClientRec { typedef struct _GrabParameters { - int grabtype; /* GRABTYPE_CORE, etc. */ + int grabtype; /* CORE, etc. */ unsigned int ownerEvents; unsigned int this_device_mode; unsigned int other_devices_mode; @@ -200,7 +200,7 @@ GrabButton( DeviceIntPtr /* modifier_device */, int /* button */, GrabParameters* /* param */, - GrabType /* grabtype */, + enum InputLevel /* grabtype */, GrabMask* /* eventMask */); extern int @@ -210,7 +210,7 @@ GrabKey( DeviceIntPtr /* modifier_device */, int /* key */, GrabParameters* /* param */, - GrabType /* grabtype */, + enum InputLevel /* grabtype */, GrabMask* /* eventMask */); extern int |