From 7159381881e5da33a49e8735811b93cbfe4f681e Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 26 Sep 2009 22:17:09 -0700 Subject: [PATCH] XQuartz: Nuke duplicate locks that make painful headaches (cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0) --- hw/xquartz/quartzKeyboard.c | 2 -- 1 file changed, 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); } /*