xserver: Branch 'master'

[GitLab Mirror]

 composite/compositeext_priv.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a532c932063c4e3d14015035b66ecf5795ad8f1b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 21 11:06:50 2024 +0100

    composite: fix duplicate typedef of ScreenPtr
    
    fix warning on duplicate typedef:
    
    > ../composite/compositeext_priv.h:11:25: warning: redefinition of typedef 'ScreenPtr' is a C11 feature [-Wtypedef-redefinition]
    > typedef struct _Screen *ScreenPtr;
    >                         ^
    > ../include/screenint.h:55:25: note: previous definition is here
    > typedef struct _Screen *ScreenPtr;
    >                         ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1430>

diff --git a/composite/compositeext_priv.h b/composite/compositeext_priv.h
index 92105ec74..c969269ba 100644
--- a/composite/compositeext_priv.h
+++ b/composite/compositeext_priv.h
@@ -8,7 +8,7 @@
 
 #include <X11/X.h>
 
-typedef struct _Screen *ScreenPtr;
+#include "screenint.h"
 
 Bool CompositeIsImplicitRedirectException(ScreenPtr pScreen,
                                           XID parentVisual,