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: NPavel Hrdina <phrdina@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>

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
 

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
 

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
 

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>

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>

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
 

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
 

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"