From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Jan 2011 22:16:41 +0000 (+0100)
Subject: make major and minor available on Solaris
X-Git-Tag: v2.19-rc2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=960f668f17ae6bb9bd5edea1b9fe05ad4d5c2850;p=thirdparty%2Futil-linux.git

make major and minor available on Solaris

Reported-by: Fabian Groffen <grobian@gentoo.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/blkdev.h b/include/blkdev.h
index 5344a2bab7..86fffcff63 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 e4d25ba466..e79640079c 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 64b3432d63..68e3923502 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 9f987b1ad8..5cd569e56b 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 0ef6f295a7..eee8ddf93d 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 c04c224274..a71b068787 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