From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 10:15:15 +0000 (+0200)
Subject: macro: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/
X-Git-Tag: lxc-3.1.0~127^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2955a58ab426137544c5c6325e35f3ccb350fb07;p=thirdparty%2Flxc.git

macro: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 79bbdb751..68bdfdcc9 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -32,6 +32,7 @@
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 /* Define __S_ISTYPE if missing from the C library. */
 #ifndef __S_ISTYPE
@@ -135,9 +136,9 @@
  *                +
  * \0           =    1
  */
-#define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1)
+#define LXC_PROC_PID_FD_LEN (6 + INTTYPE_TO_STRLEN(pid_t) + 4 + INTTYPE_TO_STRLEN(int) + 1)
 /* /proc/pid-to-str/status\0 = (5 + 21 + 7 + 1) */
-#define LXC_PROC_STATUS_LEN (5 + (LXC_NUMSTRLEN64) + 7 + 1)
+#define LXC_PROC_STATUS_LEN (5 + (INTTYPE_TO_STRLEN(pid_t)) + 7 + 1)
 #define LXC_CMD_DATA_MAX (MAXPATHLEN * 2)
 #define LXC_LSMATTRLEN (5 + (INTTYPE_TO_STRLEN(pid_t)) + 7 + 1)