Revert "include sysmacros.h where used"

This reverts commit 46a40c018438b7b2b25083a5e5a4a21055a0c1e9.

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 2b7e7122ce21838a8f29d30495f7599d35b6d134..6f9e78b342d6826bf0edb90e68ef20d52bd76cf5 100644 (file)
--- 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 955166b4b65d1f50b97f215619dea788cb6feb51..50bd6a4f80afff0c3686d3e116158c633a8e1289 100644 (file)
--- 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 7ce7bc91159c48f1a736f02c0b1a8c5788983b31..3dfdd9e9a2cc8b4d4e63ca22ff84ce2f3402b124 100644 (file)
--- 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 9b0e447d5ae297b2b2be6996955fef6d2bc0d408..f83be65e09b40aca71a3e444b3beb250e1cf016c 100644 (file)
--- 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 4b46459f5e5dabc222e61aedb82bb1b9c7fe55cb..9e973a4f76ee252d12def747f5b93bfe4974d042 100644 (file)
--- 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 d583800eb183f026f718d1a6d415c436c704074b..dbbe5b54d78accb7e21db0733e927f56842ad6af 100644 (file)
--- 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 4b8f3db9c63ce07d7a825c84b3e87782b2cef992..58fbce5d30dc993a0956f549d5ea4152a36ef4bf 100644 (file)
--- 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 3d9a76b0a17202d783284d1672b972e383d7b46e..ffbe097e4179e28db15b5afeed7dbd4da35dce15 100644 (file)
--- 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 09959d216539d332027fd472703b010186b473fa..bc67e80e8df2e0f70a8feacb63b971f089a0c031 100644 (file)
--- 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 993161c602487f20f107e511e147ff091c6ba778..e061632cadd507d55dc6b540e36d34e53c3cb5c5 100644 (file)
--- 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 b59b97bb782050865f98cbe1dd00b8ae22dcb375..7a4fd554d45f31883ae1fc298e305d23d02d0a7f 100644 (file)
--- 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 2ade0c2b4b62ce2ad6ffa5706065a96fa384d78c..bd079d47ba6ad93b5760d3309ca3aa0ffe83a58a 100644 (file)
--- 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 388f99639c783095826fdd0ba99fc5b6be223306..5eba94787dce0194a3fd7a0010ebe095b3fb877a 100644 (file)
--- 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 651a7c511941c03faf62dd06f2305a7c16827f3f..0789d37978e2a327e971bf622fa9e5891a45a004 100644 (file)
--- 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 ab3155d8d528e87ed7420910410b925f3885202d..2bab7d6af6db5ff74d80b0049fa3b21264ec8391 100644 (file)
--- 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 29b442871f33f066bec9ceaa8671f892c77b4a5c..cee70081691892f97626a22aecdb53171fb412c9 100644 (file)
--- 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 56f5336df31b0f134f01d05724a288d2ef8e8b99..fe8eab15d76e78a7528bf4cd6fbf1ef5cfbf4572 100644 (file)
--- 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 e14119b97d95f722411d72fc080da78b9a176920..f72be14b9ef652e2572592fe70eb063357ca2cc2 100644 (file)
--- 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 6010167e331916d5e51471b5421637e19943f40d..c9a39b36e4d37be1240598583b8356a10c93893e 100644 (file)
--- 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 76899645e36cb933e06edc393cc69a2d2c5d86e9..a47c1d0addc161dafb943e1b1b9dce6da2abeaaf 100644 (file)
--- 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 90a42b65b73ed4765845d5b95fdb1258cbd5b673..1d57ab3414f44f79cf65294cca071b859d49cc92 100644 (file)
--- 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 64d0a7e7f8b007e2b813b298cafb3ea2c708773f..ad9c1da2e630cdfee6c2e3de0d52b9928b0402a2 100644 (file)
--- 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>