From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 09:30:39 +0000 (+0200)
Subject: macro: move LXC_CMD_DATA_MAX from commands.h
X-Git-Tag: lxc-3.1.0~127^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b8d4c58d460efeae3773210db1a463635d5a3be;p=thirdparty%2Flxc.git

macro: move LXC_CMD_DATA_MAX from commands.h

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

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 816cd7483..24c0a22d8 100644
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -25,17 +25,15 @@
 #define __LXC_COMMANDS_H
 
 #include <stdio.h>
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 
-#include "state.h"
 #include "lxccontainer.h"
-
-#define LXC_CMD_DATA_MAX (MAXPATHLEN * 2)
-
 /* https://developer.gnome.org/glib/2.28/glib-Type-Conversion-Macros.html */
 #define INT_TO_PTR(n) ((void *)(long)(n))
 #define PTR_TO_INT(p) ((int)(long)(p))
+#include "macro.h"
+#include "state.h"
 
 typedef enum {
 	LXC_CMD_CONSOLE,
diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index aa1d5478c..6bdda6e3e 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -122,6 +122,7 @@
 #define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1)
 /* /proc/pid-to-str/status\0 = (5 + 21 + 7 + 1) */
 #define LXC_PROC_STATUS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
+#define LXC_CMD_DATA_MAX (MAXPATHLEN * 2)
 
 /* loop devices */
 #ifndef LO_FLAGS_AUTOCLEAR