diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-04-08 11:24:50 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-06-20 11:46:24 -0400 |
| commit | 0dfa816af2a383449804b891f4a9f8c431e00528 (patch) | |
| tree | 0a606630bcef340029037c49795d9d06a9619c46 /Xext | |
| parent | 98499770640c747128f212b1ebb6bd42775f3b72 (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>
(cherry picked from commit a5dd7b890f4f3a5245639591c73303c5a087b38a)
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/panoramiXprocs.c | 4 | ||||
| -rw-r--r-- | Xext/saver.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 9eb29bd74..18f3ac715 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -106,7 +106,7 @@ PanoramiXCreateWindow(ClientPtr client) if ((Mask) stuff->mask & CWColormap) { cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); - if ((tmp != CopyFromParent) && (tmp != None)) { + if (tmp != CopyFromParent) { result = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); @@ -210,7 +210,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client) if ((Mask) stuff->valueMask & CWColormap) { cmap_offset = Ones((Mask) stuff->valueMask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); - if ((tmp != CopyFromParent) && (tmp != None)) { + if (tmp != CopyFromParent) { result = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); diff --git a/Xext/saver.c b/Xext/saver.c index 0e20467c9..750b8b965 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1143,7 +1143,7 @@ ProcScreenSaverSetAttributes(ClientPtr client) if ((Mask) stuff->mask & CWColormap) { cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1)); tmp = *((CARD32 *) &stuff[1] + cmap_offset); - if ((tmp != CopyFromParent) && (tmp != None)) { + if (tmp != CopyFromParent) { status = dixLookupResourceByType((void **) &cmap, tmp, XRT_COLORMAP, client, DixReadAccess); |