From: Stéphane Graber <stgraber@ubuntu.com>
Date: Wed, 20 Jan 2016 19:12:16 +0000 (-0500)
Subject: Fix android build
X-Git-Tag: lxc-2.0.0.beta2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dacccdc160dffb3807166d077089e2783155c50;p=thirdparty%2Flxc.git

Fix android build

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

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/bdev/bdev.c
index 14f4a9e76..3c68a43b5 100644
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/bdev/bdev.c
@@ -71,14 +71,6 @@
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif
 
-#ifndef LO_FLAGS_AUTOCLEAR
-#define LO_FLAGS_AUTOCLEAR 4
-#endif
-
-#ifndef LOOP_CTL_GET_FREE
-#define LOOP_CTL_GET_FREE 0x4C82
-#endif
-
 lxc_log_define(bdev, lxc);
 
 /* aufs */
diff --git a/src/lxc/bdev/lxcloop.c b/src/lxc/bdev/lxcloop.c
index 9e977f011..c17483f4d 100644
--- a/src/lxc/bdev/lxcloop.c
+++ b/src/lxc/bdev/lxcloop.c
@@ -35,6 +35,14 @@
 #include "lxcloop.h"
 #include "utils.h"
 
+#ifndef LO_FLAGS_AUTOCLEAR
+#define LO_FLAGS_AUTOCLEAR 4
+#endif
+
+#ifndef LOOP_CTL_GET_FREE
+#define LOOP_CTL_GET_FREE 0x4C82
+#endif
+
 lxc_log_define(lxcloop, lxc);
 
 static int do_loop_create(const char *path, uint64_t size, const char *fstype);