From 57c327538ee18c1736bc4cd6d655c4d96c309900 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 29 Aug 2016 18:13:57 +0200
Subject: [PATCH] Include <sys/sysmacros.h> for major()/minor()

GNU libc pulls them implicitly from <sys/types.h>, but it will not do
that at some point in the future.  Hence, include <sys/sysmacros.h>
explicitly.
---
 cat/ls.c        | 1 +
 daemon/mknod.c  | 1 +
 diff/diff.c     | 1 +
 mllib/dev_t-c.c | 1 +
 p2v/main.c      | 1 +
 src/fuse.c      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/cat/ls.c b/cat/ls.c
index 890315914..53bc6fc1d 100644
--- a/cat/ls.c
+++ b/cat/ls.c
@@ -31,6 +31,7 @@
 #include <assert.h>
 #include <time.h>
 #include <libintl.h>
+#include <sys/sysmacros.h>
 
 #include "human.h"
 
diff --git a/daemon/mknod.c b/daemon/mknod.c
index d2ae02dd7..f8640ea51 100644
--- a/daemon/mknod.c
+++ b/daemon/mknod.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 #include "guestfs_protocol.h"
 #include "daemon.h"
diff --git a/diff/diff.c b/diff/diff.c
index e0eea57b8..9ec515dbe 100644
--- a/diff/diff.c
+++ b/diff/diff.c
@@ -32,6 +32,7 @@
 #include <time.h>
 #include <libintl.h>
 #include <sys/wait.h>
+#include <sys/sysmacros.h>
 
 #include "c-ctype.h"
 #include "human.h"
diff --git a/mllib/dev_t-c.c b/mllib/dev_t-c.c
index 036b60d71..be7260aba 100644
--- a/mllib/dev_t-c.c
+++ b/mllib/dev_t-c.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/sysmacros.h>
 
 #include <caml/mlvalues.h>
 
diff --git a/p2v/main.c b/p2v/main.c
index 36cf16fa1..a37528097 100644
--- a/p2v/main.c
+++ b/p2v/main.c
@@ -32,6 +32,7 @@
 #include <libintl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 /* errors in <gtk.h> */
 #pragma GCC diagnostic push
diff --git a/src/fuse.c b/src/fuse.c
index 01de3a9e9..83cda79d9 100644
--- a/src/fuse.c
+++ b/src/fuse.c
@@ -26,6 +26,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <libintl.h>
+#include <sys/sysmacros.h>
 
 #if HAVE_FUSE
 /* See <attr/xattr.h> */