diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-05-13 06:19:21 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-05-13 06:19:21 +0200 |
| commit | aba2a534f630f5b65a53e0ea7cdba17b77263f87 (patch) | |
| tree | 8c4e2be57984a1d9e6143944d080e19f6c3049ec /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | 6c6b6b962654ac3c15d27aafbe583ee74e4f2266 (diff) | |
| parent | 52dc49607e244c0e39b5d7cbdb8b41755f078aac (diff) | |
| download | nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.tar.gz nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.tar.bz2 nx-libs-aba2a534f630f5b65a53e0ea7cdba17b77263f87.zip | |
Merge branch 'sunweaver-pr/nxagent-no-compiler-warnings' into arctica-3.6.x
Attributes GH PR #102: https://github.com/ArcticaProject/nx-libs/pull/102
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 9ead48de1..8d1fbd4c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -685,7 +685,9 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff) int free_model = 0, free_layout = 0; XkbDescPtr xkb = NULL; + #ifdef TEST int ret; + #endif switch (onoff) { @@ -842,7 +844,10 @@ XkbError: memmove((char *) defaultKeyboardControl.autoRepeats, (char *) values.auto_repeats, sizeof(values.auto_repeats)); - ret = InitKeyboardDeviceStruct((DevicePtr) pDev, &keySyms, modmap, + #ifdef TEST + ret = + #endif + InitKeyboardDeviceStruct((DevicePtr) pDev, &keySyms, modmap, nxagentBell, nxagentChangeKeyboardControl); #ifdef TEST @@ -1208,11 +1213,9 @@ void nxagentNotifyKeyboardChanges(int oldMinKeycode, int oldMaxKeycode) if (!noXkbExtension) { DeviceIntPtr dev; - XkbDescPtr xkb; xkbNewKeyboardNotify nkn; dev = inputInfo.keyboard; - xkb = dev -> key -> xkbInfo -> desc; memset(&nkn, 0, sizeof(xkbNewKeyboardNotify)); nkn.deviceID = nkn.oldDeviceID = dev -> id; |