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 5344a2bab7a1168d28b0bc3894c70e3f40518907..86fffcff6390447888297ee3f2775aa3f9b14079 100644 (file)
--- 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 e4d25ba466329bef6ee7689eda667d681a26bcd5..e79640079c8e4ed249a8a4f69fef511e06d42026 100644 (file)
--- 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 64b3432d634536944a97d7e1900e5c635790cb18..68e3923502f6a8c44f04118c4f84c2d1d1905f7c 100644 (file)
--- 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 9f987b1ad86008899b5f1544c280ee40ab1f1b56..5cd569e56b7908000754968afb9e91fa8d6d015d 100644 (file)
--- 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 0ef6f295a705fb7af67df142abd7691e38ead1b5..eee8ddf93dde3324451df63c27ce852a56b20d47 100644 (file)
--- 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 c04c2242743950826b9a769a8b801fa125758efb..a71b068787b0c8106a898f697332433dc865fee3 100644 (file)
--- 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