summaryrefslogtreecommitdiff
path: root/hw/xquartz
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-26 22:17:09 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-26 23:30:46 -0700
commit7159381881e5da33a49e8735811b93cbfe4f681e (patch)
tree37167df1cd30272f41768ad3b6bfbf7020d9669a /hw/xquartz
parentfba8c702ba6aa8fac27682e0838fd744e197d54f (diff)
XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
Diffstat (limited to 'hw/xquartz')
-rw-r--r--hw/xquartz/quartzKeyboard.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 4abf4af7f..503383f91 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -296,13 +296,11 @@ static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
DeviceIntPtr pDev;
- pthread_mutex_lock(&keyInfo_mutex);
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
keySyms->maxKeyCode - keySyms->minKeyCode + 1,
modmap, serverClient);
- pthread_mutex_unlock(&keyInfo_mutex);
}
/*