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:
parent
3fe3f560b7
commit
075d2c0754
|
@ -49,14 +49,11 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/mman.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 "cramfs.h"
|
||||||
#include "nls.h"
|
#include "nls.h"
|
||||||
#include "blkdev.h"
|
#include "blkdev.h"
|
||||||
#include "c.h"
|
|
||||||
#include "exitcodes.h"
|
#include "exitcodes.h"
|
||||||
#include "strutils.h"
|
#include "strutils.h"
|
||||||
#include "closestream.h"
|
#include "closestream.h"
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#ifdef HAVE_SYS_SYSMACROS_H
|
|
||||||
#include <sys/sysmacros.h>
|
|
||||||
#endif
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "c.h"
|
#include "c.h"
|
||||||
|
|
|
@ -21,6 +21,10 @@
|
||||||
# include <err.h>
|
# include <err.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
# include <sys/sysmacros.h> /* for major, minor */
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Compiler-specific stuff
|
* Compiler-specific stuff
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/sysmacros.h>
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <linux/posix_types.h>
|
#include <linux/posix_types.h>
|
||||||
|
|
|
@ -48,9 +48,6 @@
|
||||||
#include <utmp.h>
|
#include <utmp.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/syslog.h>
|
#include <sys/syslog.h>
|
||||||
#ifdef HAVE_SYS_SYSMACROS_H
|
|
||||||
#include <sys/sysmacros.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_LINUX_MAJOR_H
|
#ifdef HAVE_LINUX_MAJOR_H
|
||||||
# include <linux/major.h>
|
# include <linux/major.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue