DIX: fix several duplicate typedefs (!1427) · Merge requests · xorg / xserver · GitLab

Snippets Groups Projects

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.

gitlab.freedesktop.org will be unavailable for up to a week starting March 16th, due to our ongoing infrastructure move. You can follow our planning tracker at https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/2076

Merged Enrico Weigelt, metux IT consult . requested to merge metux/xserver:submit/dix_typedef_fixes into master 11 months ago

Viewing commit 8a3cce01

Show latest version

1 file

+ 1

− 1

8a3cce01

dix: fix duplicate typedef of *ScreenPtr · 8a3cce01

Enrico Weigelt, metux IT consult . authored 11 months ago

fix warning:

> In file included from ../hw/xfree86/common/xf86Init.c:53:
> In file included from ../include/input.h:51:
> ../include/screenint.h:55:25: warning: redefinition of typedef 'ScreenPtr' is a C11 feature [-Wtypedef-redefinition]
> typedef struct _Screen *ScreenPtr;
>                         ^
> ../dix/screenint_priv.h:11:25: note: previous definition is here
> typedef struct _Screen *ScreenPtr;
>                         ^

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <!1427>

dix/screenint_priv.h

+ 1

− 1

@@ -8,7 +8,7 @@

#include <X11/Xdefs.h>

typedef struct _Screen *ScreenPtr;
#include "screenint.h"

typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);