xserver: Branch 'master'

[GitLab Mirror]

 dix/property.c     |    2 +-
 include/property.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d83c84bd9dc7fbd3588ce70b0c8bf0f63ed29ff3
Author: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
Date:   Fri Jul 23 09:24:50 2021 +0100

    Mark the dixChangeWindowProperty() value argument as const
    
    It is copied using memcpy() and not modified so we can add const. This
    fixes a -Wincompatible-pointer-types-discards-qualifiers compiler warning
    that was failing a -Werror XVnc build for me.
    
    Signed-off-by: Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>

diff --git a/dix/property.c b/dix/property.c
index ff1d6693b..94ef5a0ec 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -253,7 +253,7 @@ ProcChangeProperty(ClientPtr client)
 int
 dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
                         Atom type, int format, int mode, unsigned long len,
-                        void *value, Bool sendevent)
+                        const void *value, Bool sendevent)
 {
     PropertyPtr pProp;
     PropertyRec savedProp;
diff --git a/include/property.h b/include/property.h
index d7ccff344..6ee8a8398 100644
--- a/include/property.h
+++ b/include/property.h
@@ -72,7 +72,7 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
                                              int format,
                                              int mode,
                                              unsigned long len,
-                                             void *value,
+                                             const void *value,
                                              Bool sendevent);
 
 extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,