diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-07-12 08:13:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-12 08:13:43 -0400 |
commit | e0e5d4a37e6d3fcacea48486753f1a920ef6f51f (patch) | |
tree | d4a27000838f328e2b1be3d2096e7f3ba0095039 | |
parent | Merge pull request #744 from thejan2009/tabbed-stacked-layout-fixes (diff) | |
parent | Fix build on x86 (diff) | |
download | sway-e0e5d4a37e6d3fcacea48486753f1a920ef6f51f.tar.gz sway-e0e5d4a37e6d3fcacea48486753f1a920ef6f51f.tar.zst sway-e0e5d4a37e6d3fcacea48486753f1a920ef6f51f.zip |
Merge pull request #748 from Hummer12007/x86fix
Fix build on x86
-rw-r--r-- | sway/ipc-json.c | 3 |
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 @@ | |||
1 | #include <json-c/json.h> | 1 | #include <json-c/json.h> |
2 | #include <ctype.h> | 2 | #include <ctype.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <stdint.h> | ||
4 | #include "container.h" | 5 | #include "container.h" |
5 | #include "util.h" | 6 | #include "util.h" |
6 | #include "ipc-json.h" | 7 | #include "ipc-json.h" |
@@ -149,7 +150,7 @@ json_object *ipc_json_describe_container(swayc_t *c) { | |||
149 | 150 | ||
150 | json_object *object = json_object_new_object(); | 151 | json_object *object = json_object_new_object(); |
151 | 152 | ||
152 | json_object_object_add(object, "id", json_object_new_int((int64_t)&c)); | 153 | json_object_object_add(object, "id", json_object_new_int((intptr_t)&c)); |
153 | json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL); | 154 | json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL); |
154 | json_object_object_add(object, "rect", ipc_json_create_rect(c)); | 155 | json_object_object_add(object, "rect", ipc_json_create_rect(c)); |
155 | json_object_object_add(object, "visible", json_object_new_boolean(c->visible)); | 156 | json_object_object_add(object, "visible", json_object_new_boolean(c->visible)); |