Merge branch 'colors-userguide' into next

[i3/i3] / src / ipc.c

diff --git a/src/ipc.c b/src/ipc.c
index 7ec2592bad2968de12d738155908bed6b4df814b..577538c20ddf27af6de40bacffb37158f2477e2c 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -490,7 +490,11 @@ IPC_HANDLER(get_marks) {
     y(array_close);
 
     const unsigned char *payload;
+#if YAJL_MAJOR >= 2
+    size_t length;
+#else
     unsigned int length;
+#endif
     y(get_buf, &payload, &length);
 
     ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_MARKS, length);