From: Karel Zak <kzak@redhat.com>
Date: Tue, 8 Mar 2016 13:26:33 +0000 (+0100)
Subject: Revert "include sysmacros.h where used"
X-Git-Tag: v2.28-rc1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fe3f560b7a70c4c2303930973eb62ddd4c51f7f;p=thirdparty%2Futil-linux.git

Revert "include sysmacros.h where used"

This reverts commit 46a40c018438b7b2b25083a5e5a4a21055a0c1e9.
---

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 2b7e7122ce..6f9e78b342 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <sys/file.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 955166b4b6..50bd6a4f80 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -19,7 +19,6 @@
 #include <unistd.h>
 #include <assert.h>
 #include <dirent.h>
-#include <sys/sysmacros.h>
 
 #include <blkid.h>
 #include <libsmartcols.h>
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 7ce7bc9115..3dfdd9e9a2 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <libsmartcols.h>
diff --git a/lib/ismounted.c b/lib/ismounted.c
index 9b0e447d5a..f83be65e09 100644
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -18,7 +18,6 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <sys/param.h>
-#include <sys/sysmacros.h>
 
 #ifndef __linux__
 # ifdef HAVE_SYS_UCRED_H
diff --git a/lib/sysfs.c b/lib/sysfs.c
index 4b46459f5e..9e973a4f76 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -7,7 +7,6 @@
 #include <ctype.h>
 #include <libgen.h>
 #include <fcntl.h>
-#include <sys/sysmacros.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index d583800eb1..dbbe5b54d7 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -25,7 +25,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <sys/sysmacros.h>
 #include <dirent.h>
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 4b8f3db9c6..58fbce5d30 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -31,7 +31,6 @@
 #endif
 #include <fcntl.h>
 #include <inttypes.h>
-#include <sys/sysmacros.h>
 
 #include "blkidP.h"
 #include "pathnames.h"
diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c
index 3d9a76b0a1..ffbe097e41 100644
--- a/libblkid/src/evaluate.c
+++ b/libblkid/src/evaluate.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 09959d2165..bc67e80e8d 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -15,7 +15,6 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
index 993161c602..e061632cad 100644
--- a/libblkid/src/topology/dm.c
+++ b/libblkid/src/topology/dm.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "topology.h"
diff --git a/libblkid/src/topology/evms.c b/libblkid/src/topology/evms.c
index b59b97bb78..7a4fd554d4 100644
--- a/libblkid/src/topology/evms.c
+++ b/libblkid/src/topology/evms.c
@@ -18,7 +18,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "topology.h"
diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c
index 2ade0c2b4b..bd079d47ba 100644
--- a/libblkid/src/topology/lvm.c
+++ b/libblkid/src/topology/lvm.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "topology.h"
diff --git a/libblkid/src/topology/md.c b/libblkid/src/topology/md.c
index 388f99639c..5eba94787d 100644
--- a/libblkid/src/topology/md.c
+++ b/libblkid/src/topology/md.c
@@ -18,7 +18,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "topology.h"
diff --git a/libmount/python/fs.c b/libmount/python/fs.c
index 651a7c5119..0789d37978 100644
--- a/libmount/python/fs.c
+++ b/libmount/python/fs.c
@@ -27,7 +27,6 @@
 
 #include "pylibmount.h"
 #include <errno.h>
-#include <sys/sysmacros.h>
 
 #define Fs_HELP "Fs(source=None, root=None, target=None, fstype=None, options=None, attributes=None, freq=0, passno=0)"
 
diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index ab3155d8d5..2bab7d6af6 100644
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -14,7 +14,6 @@
 #include <ctype.h>
 #include <blkid.h>
 #include <stddef.h>
-#include <sys/sysmacros.h>
 
 #include "mountP.h"
 #include "strutils.h"
diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 29b442871f..cee7008169 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -16,7 +16,6 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 
 #include "fileutils.h"
 #include "mangle.h"
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 56f5336df3..fe8eab15d7 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index e14119b97d..f72be14b9e 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -31,7 +31,6 @@
 #include <assert.h>
 #include <poll.h>
 #include <sys/statvfs.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #ifdef HAVE_LIBUDEV
 # include <libudev.h>
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 6010167e33..c9a39b36e4 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 76899645e3..a47c1d0add 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -30,7 +30,6 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 #include <libmount.h>
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 90a42b65b7..1d57ab3414 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <inttypes.h>
 #include <getopt.h>
 
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 64d0a7e7f8..ad9c1da2e6 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 
 #include <libmount.h>