xserver: Branch 'master'

[GitLab Mirror]

 config/udev.c           |    4 ++++
 include/dix-config.h.in |    3 +++
 2 files changed, 7 insertions(+)

New commits:
commit 82f8cf8990009f6cac567814dd6b7fd41cfad82d
Author: Manoj Gupta <manojgupta at chromium.org>
Date:   Tue Nov 13 11:35:25 2018 -0800

    config/udev: 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>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/config/udev.c b/config/udev.c
index 8c6c4b666..314acba6c 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -39,6 +39,10 @@
 #include "globals.h"
 #include "systemd-logind.h"
 
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
 #define UDEV_XKB_PROP_KEY "xkb"
 
 #define LOG_PROPERTY(path, prop, val)                                   \
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 3bd22b8bb..855b3d50c 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -506,4 +506,7 @@
 /* Have epoll_create1() */
 #undef HAVE_EPOLL_CREATE1
 
+/* Have <sys/sysmacros.h> header */
+#undef HAVE_SYS_SYSMACROS_H
+
 #endif /* _DIX_CONFIG_H_ */