From 960f668f17ae6bb9bd5edea1b9fe05ad4d5c2850 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Jan 2011 23:16:41 +0100
Subject: [PATCH] make major and minor available on Solaris

Reported-by: Fabian Groffen <grobian@gentoo.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 include/blkdev.h            | 4 ++++
 shlibs/blkid/src/config.c   | 3 ---
 shlibs/blkid/src/devname.c  | 3 ---
 shlibs/blkid/src/evaluate.c | 3 ---
 shlibs/blkid/src/probe.c    | 3 ---
 shlibs/blkid/src/save.c     | 3 ---
 6 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/blkdev.h b/include/blkdev.h
index 5344a2ba..86fffcff 100644
--- a/include/blkdev.h
+++ b/include/blkdev.h
@@ -6,6 +6,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#if HAVE_SYS_MKDEV_H
+# include <sys/mkdev.h>		/* major and minor on Solaris */
+#endif
+
 #define DEFAULT_SECTOR_SIZE       512
 
 #ifdef __linux__
diff --git a/shlibs/blkid/src/config.c b/shlibs/blkid/src/config.c
index e4d25ba4..e7964007 100644
--- a/shlibs/blkid/src/config.c
+++ b/shlibs/blkid/src/config.c
@@ -17,9 +17,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
diff --git a/shlibs/blkid/src/devname.c b/shlibs/blkid/src/devname.c
index 64b3432d..68e39235 100644
--- a/shlibs/blkid/src/devname.c
+++ b/shlibs/blkid/src/devname.c
@@ -32,9 +32,6 @@
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#if HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #include <time.h>
 
 #include "blkidP.h"
diff --git a/shlibs/blkid/src/evaluate.c b/shlibs/blkid/src/evaluate.c
index 9f987b1a..5cd569e5 100644
--- a/shlibs/blkid/src/evaluate.c
+++ b/shlibs/blkid/src/evaluate.c
@@ -16,9 +16,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 0ef6f295..eee8ddf9 100644
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -97,9 +97,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
diff --git a/shlibs/blkid/src/save.c b/shlibs/blkid/src/save.c
index c04c2242..a71b0687 100644
--- a/shlibs/blkid/src/save.c
+++ b/shlibs/blkid/src/save.c
@@ -18,9 +18,6 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-- 
2.39.5