xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/xorg-wrapper.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 84e3b96b531363e47f6789aacfcae4aa60135e2e
Author: Nick Sarnie <commendsarnex at gmail.com>
Date:   Sat Sep 23 17:35:48 2017 -0400

    suid: Include sysmacros.h to fix build after glibc-2.25
    
    [Added HAVE_SYS_SYSMACROS_H guard - ajax]
    
    Signed-off-by: Nick Sarnie <commendsarnex at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index a25e6ff5f..c5e4a278b 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -35,6 +35,9 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
 #include <sys/types.h>
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>