Merge pull request #2581 from brauner/2018-09-02/macro

src/lxc/conf.c

@@ -101,6 +101,7 @@
 #include "lsm/lsm.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
+#include "macro.h"
 #include "namespace.h"
 #include "network.h"
 #include "parse.h"
@@ -111,14 +112,6 @@
 #include "terminal.h"
 #include "utils.h"
 
-#ifndef MS_PRIVATE
-#define MS_PRIVATE (1<<18)
-#endif
-
-#ifndef MS_LAZYTIME
-#define MS_LAZYTIME (1<<25)
-#endif
-
 lxc_log_define(conf, lxc);
 
 /* The lxc_conf of the container currently being worked on in an API call.

src/lxc/macro.h

@@ -303,14 +303,22 @@ extern int __build_bug_on_failed;
 #define LXC_AUDS_ADDR_LEN sizeof(((struct sockaddr_un *)0)->sun_path)
 
 /* mount */
-#ifndef MS_REC
-#define MS_REC 16384
+#ifndef MS_PRIVATE
+#define MS_PRIVATE (1<<18)
 #endif
 
 #ifndef MS_SLAVE
 #define MS_SLAVE (1 << 19)
 #endif
 
+#ifndef MS_LAZYTIME
+#define MS_LAZYTIME (1<<25)
+#endif
+
+#ifndef MS_REC
+#define MS_REC 16384
+#endif
+
 /* open */
 #ifndef O_PATH
 #define O_PATH      010000000