Merge branch 'fix-yajl-warning' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 23:33:40 +02:00
commit 4cb95b3ab3

View File

@ -490,7 +490,11 @@ IPC_HANDLER(get_marks) {
y(array_close); y(array_close);
const unsigned char *payload; const unsigned char *payload;
#if YAJL_MAJOR >= 2
size_t length;
#else
unsigned int length; unsigned int length;
#endif
y(get_buf, &payload, &length); y(get_buf, &payload, &length);
ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_MARKS, length); ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_MARKS, length);