cmd: move declarations to macro.h

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 56a45b4ac8d9226e828ba2c1b6f06b0c35d49372..75efa0a5726e6faea37c200976fba07c648fde38 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -330,6 +330,7 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
                         conf.c conf.h \
                         list.h \
                         log.c log.h \
+                        macro.h \
                         namespace.c namespace.h \
                         utils.c utils.h
 endif

diff --git a/src/lxc/cmd/lxc_usernsexec.c b/src/lxc/cmd/lxc_usernsexec.c
index 837ed3428b9ee274d94b73a35cc35b9dca7aee84..35c00c8d319dae70ba4dd8604b5c74ae78145919 100644 (file)
--- a/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@ -44,21 +44,12 @@
 #include "conf.h"
 #include "list.h"
 #include "log.h"
+#include "macro.h"
 #include "namespace.h"
 #include "utils.h"
 
-#ifndef MS_REC
-#define MS_REC 16384
-#endif
-
-#ifndef MS_SLAVE
-#define MS_SLAVE (1 << 19)
-#endif
-
 extern int lxc_log_fd;
 
-int unshare(int flags);
-
 static void usage(const char *name)
 {
        printf("usage: %s [-h] [-m <uid-maps>] -- [command [arg ..]]\n", name);

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 75c63c7c143e9ad27b87d9ba23d001c93382e09a..8eb54f1639f7dedb35ca360efc7b8b1284089ef7 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -187,4 +187,13 @@ extern int __build_bug_on_failed;
 #define NLMSG_ERROR 0x2
 #endif
 
+/* mount */
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+
+#ifndef MS_SLAVE
+#define MS_SLAVE (1 << 19)
+#endif
+
 #endif /* __LXC_MACRO_H */