From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Jan 2011 22:37:16 +0000 (+0100)
Subject: libblkid: add blkdev.h to blkidP.h
X-Git-Tag: v2.19-rc2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c3508bdf5040bb092078fe5806a89056e9edbbf;p=thirdparty%2Futil-linux.git

libblkid: add blkdev.h to blkidP.h

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/shlibs/blkid/src/blkidP.h b/shlibs/blkid/src/blkidP.h
index ab954e06cf..5bf9ccaf36 100644
--- a/shlibs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
@@ -25,6 +25,7 @@
 
 #include "c.h"
 #include "bitops.h"	/* $(top_srcdir)/include/ */
+#include "blkdev.h"
 
 #include "blkid.h"
 #include "list.h"
diff --git a/shlibs/blkid/src/config.c b/shlibs/blkid/src/config.c
index e79640079c..110251a92f 100644
--- a/shlibs/blkid/src/config.c
+++ b/shlibs/blkid/src/config.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <stdarg.h>
 
-#include "blkdev.h"
 #include "blkidP.h"
 #include "env.h"
 
diff --git a/shlibs/blkid/src/encode.c b/shlibs/blkid/src/encode.c
index a5f800b686..03d5f4ef13 100644
--- a/shlibs/blkid/src/encode.c
+++ b/shlibs/blkid/src/encode.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "blkdev.h"
 #include "blkidP.h"
 
 #define UDEV_ALLOWED_CHARS_INPUT               "/ $%?,"
diff --git a/shlibs/blkid/src/evaluate.c b/shlibs/blkid/src/evaluate.c
index 5cd569e56b..0b1cd51f9e 100644
--- a/shlibs/blkid/src/evaluate.c
+++ b/shlibs/blkid/src/evaluate.c
@@ -25,7 +25,6 @@
 #include "pathnames.h"
 #include "canonicalize.h"
 
-#include "blkdev.h"
 #include "blkidP.h"
 
 /**
diff --git a/shlibs/blkid/src/getsize.c b/shlibs/blkid/src/getsize.c
index 2ba8bc65bb..abe6ebc9ca 100644
--- a/shlibs/blkid/src/getsize.c
+++ b/shlibs/blkid/src/getsize.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "blkdev.h"
 #include "blkidP.h"
 
 /**
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index eee8ddf93d..677b32fabc 100644
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -112,7 +112,6 @@
 # endif
 #endif
 
-#include "blkdev.h"
 #include "blkidP.h"
 
 /* chains */
diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c
index 268b2d9b70..d1deb5eaf6 100644
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/shlibs/blkid/src/superblocks/superblocks.c
@@ -19,9 +19,6 @@
 #include <stdint.h>
 #include <stdarg.h>
 
-#include "blkdev.h"
-#include "blkidP.h"
-
 #include "superblocks.h"
 
 /**
diff --git a/shlibs/blkid/src/topology/ioctl.c b/shlibs/blkid/src/topology/ioctl.c
index f18f856839..73c18ec9bb 100644
--- a/shlibs/blkid/src/topology/ioctl.c
+++ b/shlibs/blkid/src/topology/ioctl.c
@@ -16,7 +16,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "blkdev.h"		/* top-level lib/ */
 #include "topology.h"
 
 /*