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.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 138f2701295b6925779b33c5112befab808ad7da..1b0abb21a0d44b4c1b8f634702a4df090023f669 100644 (file)
--- 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 a6966dcf355eab257838f63e5c56745d8e9730a1..c3dec0859ced41f1ba26957e0098d40cb5891b4b 100644 (file)
--- 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 bc86f35f52cbc11813dbd3dda97b10b7535d8635..f7376188f0789968bb8aabccffa611869f7484f0 100644 (file)
--- 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 f29c47ad6b8378104f554ef325a4a4ce970f250f..6ebee4d5f407d5fcd20a7ada75b086431012827a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -62,9 +62,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 526ce9da035689f91fee6179dd07354e9a3f4135..0680ff7c24106592bfe75a221fd265c9941f1b7b 100644 (file)
--- 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 cc6a099faae6e8f4c8a6044b03d01bf1e19d005a..feb5982315e390c117dbc40ce9968399c39be4ec 100644 (file)
--- 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 d5f3e72ba93401a21dda9660499b919f5b89b6cb..bdb79c7f1b3480138df25db13a9093cbc751af66 100644 (file)
--- 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 9ec3b576d204cec0f195995ee4253c9515a3ff06..66b8c018523ab6a09d891f88c8b29c707273c1fa 100644 (file)
--- 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"