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>
This commit is contained in:
Karel Zak 2016-03-08 14:29:45 +01:00
parent 3fe3f560b7
commit 075d2c0754
5 changed files with 5 additions and 11 deletions

View File

@ -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"

View File

@ -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"

View File

@ -21,6 +21,10 @@
# include <err.h>
#endif
#ifdef HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */
#endif
/*
* Compiler-specific stuff
*/

View File

@ -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>

View File

@ -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