From 54c4b1656f93997ae5624051c91ea10249e5a823 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Tue, 19 Apr 2016 10:57:45 +0200
Subject: [PATCH] Include sys/sysmacros.h if present.

Needed for major/minor definitions.

Thanks Mike Frysinger for pointing this out.
---
 configure.ac        | 2 +-
 lib/utils_devpath.c | 3 +++
 lib/utils_loop.c    | 3 +++
 lib/utils_wipe.c    | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1309b278..05328512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ PKG_PROG_PKG_CONFIG
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h malloc.h inttypes.h sys/ioctl.h sys/mman.h \
-	ctype.h unistd.h locale.h byteswap.h endian.h)
+	sys/sysmacros.h ctype.h unistd.h locale.h byteswap.h endian.h)
 
 AC_CHECK_HEADERS(uuid/uuid.h,,[AC_MSG_ERROR([You need the uuid library.])])
 AC_CHECK_HEADER(libdevmapper.h,,[AC_MSG_ERROR([You need the device-mapper library.])])
diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index 963785a3..1e0933a1 100644
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -31,6 +31,9 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>     /* for major, minor */
+#endif
 #include "internal.h"
 
 static char *__lookup_dev(char *path, dev_t dev, int dir_level, const int max_level)
diff --git a/lib/utils_loop.c b/lib/utils_loop.c
index ff30a27c..8f303ca8 100644
--- a/lib/utils_loop.c
+++ b/lib/utils_loop.c
@@ -28,6 +28,9 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>     /* for major, minor */
+#endif
 #include <linux/loop.h>
 
 #include "utils_loop.h"
diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c
index 210c566a..2b47bca0 100644
--- a/lib/utils_wipe.c
+++ b/lib/utils_wipe.c
@@ -29,6 +29,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>     /* for major, minor */
+#endif
 #include <fcntl.h>
 
 #include "libcryptsetup.h"