]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
tree-wide: include <sys/sysmacros.h> directly 1476/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 20 Mar 2017 14:42:50 +0000 (15:42 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 20 Mar 2017 14:42:50 +0000 (15:42 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/bdev/lxclvm.c
src/lxc/conf.c

index 75de17f61ad87296a5c9e4caec9c18fa70d5a418..bcd8be8f4e7ac9f7c5250a445c58dd100662c90b 100644 (file)
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/sysmacros.h>
 #include <sys/wait.h>
 
 #include "bdev.h"
@@ -41,9 +42,6 @@
 #ifdef MAJOR_IN_MKDEV
 #    include <sys/mkdev.h>
 #endif
-#ifdef MAJOR_IN_SYSMACROS
-#    include <sys/sysmacros.h>
-#endif
 
 lxc_log_define(lxclvm, lxc);
 
index edad28f6f296337bc4a7e7ddc72e3ff3ecb319b4..55de873d54d5b118b5081010665fedd88f180e35 100644 (file)
@@ -47,6 +47,7 @@
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/sysmacros.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
@@ -56,9 +57,6 @@
 #ifdef MAJOR_IN_MKDEV
 #    include <sys/mkdev.h>
 #endif
-#ifdef MAJOR_IN_SYSMACROS
-#    include <sys/sysmacros.h>
-#endif
 
 #ifdef HAVE_STATVFS
 #include <sys/statvfs.h>