diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
| commit | d7aef3f663f4b5d861799f8615dcd301d5ce2906 (patch) | |
| tree | 3a5ed1b3dc7e83536979578e3da99f2860f44b11 /xkb/xkbEvents.c | |
| parent | a25f248fc3bd0375d91ca8a44320200d445ecfbb (diff) | |
| parent | e08c6a0752772745f35f7afcf6c2b1c927b91cc0 (diff) | |
Merge branch 'master' into xi2
Conflicts:
Xext/geext.c
Xi/chdevcur.c
Xi/extgrbdev.c
Xi/xiproperty.c
configure.ac
dix/ptrveloc.c
hw/xfree86/common/xf86Config.c
mi/mipointer.h
test/input.c
xkb/xkb.c
Diffstat (limited to 'xkb/xkbEvents.c')
| -rw-r--r-- | xkb/xkbEvents.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index d7a186bd7..e56694dbf 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -1132,7 +1132,7 @@ ClientPtr client = NULL; autoCtrls= interest->autoCtrls; autoValues= interest->autoCtrlValues; client= interest->client; - _XkbFree(interest); + xfree(interest); found= True; } while ((!found)&&(interest->next)) { @@ -1142,7 +1142,7 @@ ClientPtr client = NULL; autoCtrls= victim->autoCtrls; autoValues= victim->autoCtrlValues; client= victim->client; - _XkbFree(victim); + xfree(victim); found= True; } interest = interest->next; |