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

Manoj Gupta manojgupta at chromium.org
Mon Nov 12 21:48:34 UTC 2018


Hi All,

I recently ran into compiler errors when building xwayland in Chrome
OS related to use of major()/minor() in config/udev.c.

The patch fixing the problem by including  "xorg-config.h"  and
<sys/sysmacros.h> .

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

Thanks,
Manoj

[PATCH]

Include header <sys/sysmacros.h> to use major/minor.

glibc 2.25 has dropped sys/sysmacros.h from sys/types.h, so add
it explicitly in config/udev.c.

This is similar to the commit 84e3b96b531363e47f6789aacfcae4aa60135e2e .

Signed-off-by: Manoj Gupta <manojgupta at chromium.org>
---
 config/udev.c | 5 +++++
 1 file changed, 5 insertions(+)

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"
+
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif

 #define UDEV_XKB_PROP_KEY "xkb"


More information about the xorg-devel mailing list