diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
| commit | dca37d126746d995167a31f58d3a395ae162f5d4 (patch) | |
| tree | 6f5a0e00be9e5f70d6bc341d4abdb1f14c8f79a2 /xorg-server/hw/xquartz/quartzKeyboard.c | |
| parent | 23fda7c555e6c749b1d9727be5e5571a0559b9b3 (diff) | |
| parent | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (diff) | |
| download | vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.gz vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.bz2 vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzKeyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c index 96b5fa5b6..3b4eac31c 100644 --- a/xorg-server/hw/xquartz/quartzKeyboard.c +++ b/xorg-server/hw/xquartz/quartzKeyboard.c @@ -368,7 +368,7 @@ void DarwinKeyboardReloadHandler(void) { KeySymsRec keySyms; CFIndex initialKeyRepeatValue, keyRepeatValue; BOOL ok; - DeviceIntPtr pDev = darwinKeyboard; + DeviceIntPtr pDev; const char *xmodmap = PROJECTROOT "/bin/xmodmap"; const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap"; const char *homedir = getenv("HOME"); |