From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 6 Apr 2015 21:58:44 +0000 (-0400)
Subject: Fix Android build because of getmntent_r
X-Git-Tag: lxc-2.0.0.beta1~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=684f79a55a6909ac3669eb6126796853f85b28eb;p=thirdparty%2Flxc.git

Fix Android build because of getmntent_r

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index ee664f7e4..726229fd3 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -67,6 +67,12 @@
 #include <../include/ifaddrs.h>
 #endif
 
+#if IS_BIONIC
+#include <../include/lxcmntent.h>
+#else
+#include <mntent.h>
+#endif
+
 #define MAX_BUFFER 4096
 
 #define NOT_SUPPORTED_ERROR "the requested function %s is not currently supported with unprivileged containers"
@@ -84,7 +90,6 @@ return -1;
 }
 #endif
 
-
 lxc_log_define(lxc_container, lxc);
 
 static bool do_lxcapi_destroy(struct lxc_container *c);