Patch for glibc 2.25+ in xserver config/udev.c

Adam Jackson ajax at nwnk.net
Tue Nov 13 16:14:53 UTC 2018


On Mon, 2018-11-12 at 13:48 -0800, Manoj Gupta wrote:

> Is this the right mailing list for this patch? If not, please advise.

This is the right list, although we're generally moving to gitlab for
patch submission:

https://gitlab.freedesktop.org/xorg/xserver/

> diff --git a/config/udev.c b/config/udev.c
> index 8c6c4b666..c5edc9932 100644
> --- a/config/udev.c
> +++ b/config/udev.c
> @@ -38,6 +38,11 @@
>  #include "os.h"
>  #include "globals.h"
>  #include "systemd-logind.h"
> +#include "xorg-config.h"

This is incorrect, though an understandable mistake to make. xorg-
config.h should ideally only be included from files under hw/xfree86/,
outside of that the code is potentially built into multiple servers so
it should use dix-config.h instead.

This file already includes dix-config.h, so instead we should change
include/dix-config.h.in to also have a #undef HAVE_SYS_SYSMACROS_H so
that...

> +#ifdef HAVE_SYS_SYSMACROS_H
> +#include <sys/sysmacros.h>
> +#endif

... the above will see the macrod as defined.

- ajax



More information about the xorg-devel mailing list