aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Display.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-20 10:31:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-20 10:31:24 +0200
commit61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch)
treef0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/programs/Xserver/hw/nxagent/Display.c
parentda01dc8da1aedb1f75d62c03748a239c54b14483 (diff)
parent50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff)
downloadnx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz
nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2
nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 04f2fbb4c..f1fb1e902 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -2468,7 +2468,6 @@ static int nxagentCheckForPixmapFormatsCompatibility()
*/
bool compatible = true;
- bool one_match = false;
bool matched = false;
int total_matches = 0;
@@ -2483,7 +2482,6 @@ static int nxagentCheckForPixmapFormatsCompatibility()
nxagentPixmapFormats[i].scanline_pad == nxagentRemotePixmapFormats[j].scanline_pad)
{
matched = true;
- one_match = true;
++total_matches;
break;