From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 28 Apr 2011 18:25:57 +0000 (+0200)
Subject: yajl compatibility: forgot add_subscription (Thanks badboy)
X-Git-Tag: 4.0~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5bef3ab51cf4b6557688a7530f4de822cb5a32d;p=i3%2Fi3

yajl compatibility: forgot add_subscription (Thanks badboy)
---

diff --git a/src/ipc.c b/src/ipc.c
index d2f0def0..3b4bb524 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -304,8 +304,13 @@ IPC_HANDLER(get_outputs) {
  * Callback for the YAJL parser (will be called when a string is parsed).
  *
  */
+#if YAJL_MAJOR >= 2
+static int add_subscription(void *extra, const unsigned char *s,
+                            size_t len) {
+#else
 static int add_subscription(void *extra, const unsigned char *s,
                             unsigned int len) {
+#endif
         ipc_client *client = extra;
 
         DLOG("should add subscription to extra %p, sub %.*s\n", client, len, s);