[lxc-devel] [lxc/master] tree-wide: include <sys/sysmacros.h> directly

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170320/cacd8f0c/attachment.bin>
-------------- next part --------------
From ce831b3b8887b0c1dfea637bdb16d38d1cd277fd Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Mon, 20 Mar 2017 15:42:50 +0100
Subject: [PATCH] tree-wide: include <sys/sysmacros.h> directly

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/bdev/lxclvm.c | 4 +---
 src/lxc/conf.c        | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
index 75de17f..bcd8be8 100644
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/bdev/lxclvm.c
@@ -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);
 
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index edad28f..55de873 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -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>