include: move sys/sysmacros.h to c.h

The file is no portable (#ifdef HAVE_SYS_SYSMACROS_H is necessary),
but needed on many places. It seems better to keep it in c.h.

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

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index d3088a5ab1478d1dbcf6a3177d709b554d645359..ef311c103ae4e309b30399c82b383b6954dcb6c1 100644 (file)
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -49,14 +49,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#ifdef HAVE_SYS_SYSMACROS_H
-#include <sys/sysmacros.h>     /* for major, minor */
-#endif
 
+#include "c.h"
 #include "cramfs.h"
 #include "nls.h"
 #include "blkdev.h"
-#include "c.h"
 #include "exitcodes.h"
 #include "strutils.h"
 #include "closestream.h"

diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 6c4b6de8eaab5bcacf145bf4179e1384cd661cac..b8dbe72fa9fbeee152a9ba01e968e14c4a8e7895 100644 (file)
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -20,9 +20,6 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSMACROS_H
-#include <sys/sysmacros.h>
-#endif
 #include <unistd.h>
 
 #include "c.h"

diff --git a/include/c.h b/include/c.h
index aec34394d1a27db1b6f5dd2d5f8b15b7a47ccb0c..08dab934a0b55b9b712ff052d362a95c86bba7e7 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -21,6 +21,10 @@
 # include <err.h>
 #endif
 
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>     /* for major, minor */
+#endif
+
 /*
  * Compiler-specific stuff
  */

diff --git a/lib/loopdev.c b/lib/loopdev.c
index b2c8b987be04b56b8c8f1478af7631601af7264f..9ae61daa958df5e9f0ea28ff79975bd0bd0f946a 100644 (file)
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -29,7 +29,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <sys/sysmacros.h>
 #include <inttypes.h>
 #include <dirent.h>
 #include <linux/posix_types.h>

diff --git a/login-utils/login.c b/login-utils/login.c
index 236da9b3d8248056f7bf355bba0209ed8222f2a4..64326937af7ed18d708d6ac1957f5ff0f0e2b39d 100644 (file)
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -48,9 +48,6 @@
 #include <utmp.h>
 #include <stdlib.h>
 #include <sys/syslog.h>
-#ifdef HAVE_SYS_SYSMACROS_H
-#include <sys/sysmacros.h>
-#endif
 #ifdef HAVE_LINUX_MAJOR_H
 # include <linux/major.h>
 #endif