summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/blkdev.h4
-rw-r--r--shlibs/blkid/src/config.c3
-rw-r--r--shlibs/blkid/src/devname.c3
-rw-r--r--shlibs/blkid/src/evaluate.c3
-rw-r--r--shlibs/blkid/src/probe.c3
-rw-r--r--shlibs/blkid/src/save.c3
6 files changed, 4 insertions, 15 deletions
diff --git a/include/blkdev.h b/include/blkdev.h
index 5344a2bab..86fffcff6 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 e4d25ba46..e79640079 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 64b3432d6..68e392350 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 9f987b1ad..5cd569e56 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 0ef6f295a..eee8ddf93 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 c04c22427..a71b06878 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