diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-06 22:12:14 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-06 23:05:42 -0800 |
| commit | b15be8547d4d204f3e498f52d86713a76766e871 (patch) | |
| tree | b7b67004984cb52cdd1a88356d19d2e440f22042 | |
| parent | 82e0ae042379181eb143431e1413084432a17079 (diff) | |
Xi: Fix mishandled git merge
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | Xi/xichangehierarchy.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 4a15d5c63..3facadd92 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -216,19 +216,6 @@ disable_clientpointer(DeviceIntPtr dev) } static int -disable_clientpointer(DeviceIntPtr dev) -{ - int i; - - for (i = 0; i < currentMaxClients; i++) - { - ClientPtr client = clients[i]; - if (client && client->clientPtr == dev) - client->clientPtr = NULL; - } -} - -static int remove_master(ClientPtr client, xXIRemoveMasterInfo *r, int flags[MAXDEVICES]) { |