xserver: Branch 'master'

[Adam Jackson]

 exa/exa_priv.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 610055809f4030bd0e7312c6b0c561fdfe6e0183
Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Tue Mar 13 10:55:22 2018 +0000

    exa: promise not to touch the data when swapping pointers
    
    exa/exa.c:525:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
         swap(pExaGC, pGC, funcs);
              ^
    
    Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index ca4db720f..912e21478 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -244,7 +244,7 @@ extern DevPrivateKeyRec exaScreenPrivateKeyRec;
 }
 #else
 #define swap(priv, real, mem) {\
-    void *tmp = priv->Saved##mem; \
+    const void *tmp = priv->Saved##mem; \
     priv->Saved##mem = real->mem; \
     real->mem = tmp; \
 }