File 0001-tree-wide-include-sys-sysmacros.h-directly... of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-tree-wide-include-sys-sysmacros.h-directly.patch of Package lxc (Revision a150fb1158b7cc2fdbb6dc8ef6daf384)

Currently displaying revision a150fb1158b7cc2fdbb6dc8ef6daf384 , Show latest

From 1750a26028f6e6543795fe6b1d26e8f241348390 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@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@ubuntu.com>
Signed-off-by: Johannes Kastl <git@ojkastl.de>
---
 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 75de17f6..bcd8be8f 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 6b345256..a02a82b2 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>
-- 
2.12.2

Places

File 0001-tree-wide-include-sys-sysmacros.h-directly.patch of Package lxc (Revision a150fb1158b7cc2fdbb6dc8ef6daf384)

Places