diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-08-03 21:07:23 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-03 21:07:23 -0400 |
| commit | 735f3d076e7510ca20ada410037ed183f6f09fe5 (patch) | |
| tree | 1ae607832d91505186c99d4877c7cf5c4a39c45b | |
| parent | Merge pull request #822 from mayhewj/add-resize-to-config (diff) | |
| parent | Use uintptr_t for ipc container id (diff) | |
| download | sway-735f3d076e7510ca20ada410037ed183f6f09fe5.tar.gz sway-735f3d076e7510ca20ada410037ed183f6f09fe5.tar.zst sway-735f3d076e7510ca20ada410037ed183f6f09fe5.zip | |
Merge pull request #827 from acrisci/bug/ipc-id-uint
Use uintptr_t for ipc container id
| -rw-r--r-- | sway/ipc-json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 38aa7a8d..2d3f4601 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
| @@ -214,7 +214,7 @@ json_object *ipc_json_describe_container(swayc_t *c) { | |||
| 214 | 214 | ||
| 215 | json_object *object = json_object_new_object(); | 215 | json_object *object = json_object_new_object(); |
| 216 | 216 | ||
| 217 | json_object_object_add(object, "id", json_object_new_int((intptr_t)&c)); | 217 | json_object_object_add(object, "id", json_object_new_int((uintptr_t)&c)); |
| 218 | json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL); | 218 | json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL); |
| 219 | json_object_object_add(object, "rect", ipc_json_create_rect(c)); | 219 | json_object_object_add(object, "rect", ipc_json_create_rect(c)); |
| 220 | json_object_object_add(object, "visible", json_object_new_boolean(c->visible)); | 220 | json_object_object_add(object, "visible", json_object_new_boolean(c->visible)); |