diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-04-08 11:24:50 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-04-29 11:19:58 -0400 |
| commit | a5dd7b890f4f3a5245639591c73303c5a087b38a (patch) | |
| tree | de5f14cdb68b3bca619aa5670dcd01c7175608f8 /dix | |
| parent | 23dfa017298ceceac818f83779858e490c7757b6 (diff) | |
dix: Squash some new gcc6 warnings
-Wlogical-op now tells us:
devices.c:1685:23: warning: logical ‘and’ of equal expressions
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index 9b0c7d296..a532dcfaa 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1682,8 +1682,7 @@ ProcSetModifierMapping(ClientPtr client) stuff->numKeyPerModifier); if (rc == MappingFailed || rc == -1) return BadValue; - if (rc != Success && rc != MappingSuccess && rc != MappingFailed && - rc != MappingBusy) + if (rc != MappingSuccess && rc != MappingFailed && rc != MappingBusy) return rc; rep.success = rc; |