sway

commit e0e5d4a37e6d3fcacea48486753f1a920ef6f51f
parent 0374154749653b5f29b86e255af7b2346bddebe0
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 12 Jul 2016 08:13:43 -0400

Merge pull request #748 from Hummer12007/x86fix

Fix build on x86
Diffstat:
M
sway/ipc-json.c
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
@@ -1,6 +1,7 @@
 #include <json-c/json.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdint.h>
 #include "container.h"
 #include "util.h"
 #include "ipc-json.h"
@@ -149,7 +150,7 @@ json_object *ipc_json_describe_container(swayc_t *c) {
 
 	json_object *object = json_object_new_object();
 
-	json_object_object_add(object, "id", json_object_new_int((int64_t)&c));
+	json_object_object_add(object, "id", json_object_new_int((intptr_t)&c));
 	json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL);
 	json_object_object_add(object, "rect", ipc_json_create_rect(c));
 	json_object_object_add(object, "visible", json_object_new_boolean(c->visible));