summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2016-07-12 08:13:43 -0400
committerFurkan Sahin <furkan-dev@proton.me>2016-07-12 08:13:43 -0400
commitc50d013acf3269be7d40fd05451081918e7bb2b8 (patch)
treed4a27000838f328e2b1be3d2096e7f3ba0095039
parenta5f7166b09b862678e9534155d21a8426da7a580 (diff)
parent1f57026223f6af78330baba03599d021fc08153a (diff)
Merge pull request #748 from Hummer12007/x86fix
Fix build on x86
-rw-r--r--sway/ipc-json.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 7edc30f7..446b1815 100644
--- 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));