From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 09:31:36 +0000 (+0200)
Subject: macro: add PTR_TO_INT() and INT_TO_PTR()
X-Git-Tag: lxc-3.1.0~127^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=245532a2adc8eedd48c05d513b74fa9a7102b3f7;p=thirdparty%2Flxc.git

macro: add PTR_TO_INT() and INT_TO_PTR()

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

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 24c0a22d8..2c024b65d 100644
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -29,9 +29,6 @@
 #include <unistd.h>
 
 #include "lxccontainer.h"
-/* 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"
 
diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 6bdda6e3e..17cf0eb19 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -27,6 +27,7 @@
 #include <linux/loop.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
@@ -266,4 +267,8 @@ extern int __build_bug_on_failed;
 #define SOCK_CLOEXEC 02000000
 #endif
 
+/* pointer conversion macros */
+#define PTR_TO_INT(p) ((int)((intptr_t)(p)))
+#define INT_TO_PTR(u) ((void *)((intptr_t)(u)))
+
 #endif /* __LXC_MACRO_H */