Merge pull request #1476 from brauner/2017-03-20/sysmacro

tree-wide: include <sys/sysmacros.h> directly
This commit is contained in:
Stéphane Graber 2017-03-20 11:10:57 -04:00 committed by GitHub
commit f5c3ae5928
2 changed files with 2 additions and 6 deletions

View File

@ -29,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/sysmacros.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "bdev.h" #include "bdev.h"
@ -41,9 +42,6 @@
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
# include <sys/mkdev.h> # include <sys/mkdev.h>
#endif #endif
#ifdef MAJOR_IN_SYSMACROS
# include <sys/sysmacros.h>
#endif
lxc_log_define(lxclvm, lxc); lxc_log_define(lxclvm, lxc);

View File

@ -47,6 +47,7 @@
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/sysmacros.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/utsname.h> #include <sys/utsname.h>
@ -56,9 +57,6 @@
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
# include <sys/mkdev.h> # include <sys/mkdev.h>
#endif #endif
#ifdef MAJOR_IN_SYSMACROS
# include <sys/sysmacros.h>
#endif
#ifdef HAVE_STATVFS #ifdef HAVE_STATVFS
#include <sys/statvfs.h> #include <sys/statvfs.h>