[lxc-devel] [lxc/master] android: fix includes

brauner on Github lxc-bot at linuxcontainers.org
Thu Aug 10 21:00:47 UTC 2017


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/20170810/c45af21a/attachment.bin>
-------------- next part --------------
From eb37f8e2d1fca0a27180a611ffd8d13cf2b09356 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Thu, 10 Aug 2017 23:00:12 +0200
Subject: [PATCH] android: fix includes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/storage/aufs.h    | 6 +-----
 src/lxc/storage/overlay.h | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/lxc/storage/aufs.h b/src/lxc/storage/aufs.h
index dfebbe966..986fc7a43 100644
--- a/src/lxc/storage/aufs.h
+++ b/src/lxc/storage/aufs.h
@@ -28,11 +28,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#if IS_BIONIC
-#include <../include/lxcmntent.h>
-#else
-#include <mntent.h>
-#endif
+#include "storage.h"
 
 struct lxc_storage;
 
diff --git a/src/lxc/storage/overlay.h b/src/lxc/storage/overlay.h
index c2ee7bb25..37fc8915b 100644
--- a/src/lxc/storage/overlay.h
+++ b/src/lxc/storage/overlay.h
@@ -30,11 +30,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#if IS_BIONIC
-#include <../include/lxcmntent.h>
-#else
-#include <mntent.h>
-#endif
+#include "storage.h"
 
 struct lxc_storage;
 


More information about the lxc-devel mailing list