xserver: Branch 'master'

[GitLab Mirror]

 dix/input_priv.h |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit f0fd9f8bf41c4cdf0752fe5af942063d816375c7
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu May 15 12:33:25 2025 +0200

    dix: fix warning on redefinition of typedefs
    
    | ../dix/input_priv.h:56:29: warning: redefinition of typedef 'InputOption' is a C11 feature [-Wtypedef-redefinition]
    |    56 | typedef struct _InputOption InputOption;
    |       |                             ^
    | ../include/input.h:255:29: note: previous definition is here
    |   255 | typedef struct _InputOption InputOption;
    |       |                             ^
    | In file included from ../hw/xfree86/common/xf86Cursor.c:36:
    | ../dix/input_priv.h:57:25: warning: redefinition of typedef 'XI2Mask' is a C11 feature [-Wtypedef-redefinition]
    |    57 | typedef struct _XI2Mask XI2Mask;
    |       |                         ^
    | ../include/input.h:256:25: note: previous definition is here
    |   256 | typedef struct _XI2Mask XI2Mask;
    |       |                         ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1978>

diff --git a/dix/input_priv.h b/dix/input_priv.h
index 65766dc52..69802e077 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -53,9 +53,6 @@ SOFTWARE.
 
 #include "input.h"
 
-typedef struct _InputOption InputOption;
-typedef struct _XI2Mask XI2Mask;
-
 void InitCoreDevices(void);
 void InitXTestDevices(void);