aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-03-21 09:48:11 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-05-02 14:53:06 +0200
commit182569bf6f4fdd8f5761d15fa0f184665ee787b5 (patch)
tree1b45b8e54ab98cb132ada8165f72909975450322
parent66f889542f07ba3715d22dc55ffea6005bdc5a9f (diff)
downloadnx-libs-182569bf6f4fdd8f5761d15fa0f184665ee787b5.tar.gz
nx-libs-182569bf6f4fdd8f5761d15fa0f184665ee787b5.tar.bz2
nx-libs-182569bf6f4fdd8f5761d15fa0f184665ee787b5.zip
hw/nxagent/Keyboard.c: The ret variable is only used later on when compiled with -DTEST.
Amends the following compiler warning: ``` Keyboard.c: In function ‘nxagentKeyboardProc’: Keyboard.c:688:7: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] int ret; ^ ```
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 560ca64e4..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