[libvirt PATCH v2 51/56] src: assume sys/sysmacros.h always exists on Linux

All our supported Linux distros now have this header. It has never existed on FreeBSD / macOS / Mingw. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/conf/domain_audit.c | 4 +--- src/lxc/lxc_controller.c | 4 +--- src/lxc/lxc_driver.c | 4 +--- src/qemu/qemu_domain.c | 4 +--- src/util/vircgroup.c | 8 +------- src/util/virdevmapper.c | 4 +--- src/util/virutil.c | 4 +--- tests/vircgroupmock.c | 8 +------- 8 files changed, 8 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 138f270129..1b0abb21a0 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -23,9 +23,7 @@ #include <sys/stat.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 558a964fca..c0a9f33c18 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -24,9 +24,7 @@ #include <sys/epoll.h> #include <sys/wait.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index bc86f35f52..f7376188f0 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -25,9 +25,7 @@ #include <sched.h> #include <sys/utsname.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b0c0e1a19b..a544a514a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -63,9 +63,7 @@ #include "virdomaincheckpointobjlist.h" #include "backup_conf.h" -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif #include <sys/time.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 526ce9da03..0680ff7c24 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -25,13 +25,7 @@ # include <sys/mount.h> # include <fcntl.h> # include <sys/stat.h> - -# ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -# elif MAJOR_IN_SYSMACROS -# include <sys/sysmacros.h> -# endif - +# include <sys/sysmacros.h> # include <sys/types.h> # include <signal.h> # include <dirent.h> diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index cc6a099faa..feb5982315 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -20,9 +20,7 @@ #include <config.h> -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/src/util/virutil.c b/src/util/virutil.c index d5f3e72ba9..bdb79c7f1b 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -31,9 +31,7 @@ # include <conio.h> #endif /* WIN32 */ -#ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -#elif MAJOR_IN_SYSMACROS +#ifdef __linux__ # include <sys/sysmacros.h> #endif diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 9ec3b576d2..66b8c01852 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -23,13 +23,7 @@ # include <unistd.h> # include <fcntl.h> # include <sys/stat.h> - -# ifdef MAJOR_IN_MKDEV -# include <sys/mkdev.h> -# elif MAJOR_IN_SYSMACROS -# include <sys/sysmacros.h> -# endif - +# include <sys/sysmacros.h> # include <stdarg.h> # include "testutilslxc.h" # include "virstring.h" -- 2.24.1