nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restore i3bar compatibility with libyajl version 1 

fixes #1004
This commit is contained in:
haptix@web.de 2013-04-06 14:50:46 +02:00 committed by Michael Stapelberg
parent 0659a0d98c
commit 402c3db7ac
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i3bar/src/child.c
View File

@ -359,7 +359,11 @@ void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
void child_write_output(void) { void child_write_output(void) {
if (child.click_events) { if (child.click_events) {
const unsigned char *output; const unsigned char *output;
#if YAJL_MAJOR < 2
unsigned int size;
#else
size_t size; size_t size;
#endif
yajl_gen_get_buf(gen, &output, &size); yajl_gen_get_buf(gen, &output, &size);
write(child_stdin, output, size); write(child_stdin, output, size);
write(child_stdin, "\n", 1); write(child_stdin, "\n", 1);
@ -388,11 +392,13 @@ void start_child(char *command) {
yajl_parser_config parse_conf = { 0, 0 }; yajl_parser_config parse_conf = { 0, 0 };
parser = yajl_alloc(&callbacks, &parse_conf, NULL, (void*)&parser_context); parser = yajl_alloc(&callbacks, &parse_conf, NULL, (void*)&parser_context);
gen = yajl_gen_alloc(NULL, NULL);
#else #else
parser = yajl_alloc(&callbacks, NULL, &parser_context); parser = yajl_alloc(&callbacks, NULL, &parser_context);
#endif
gen = yajl_gen_alloc(NULL); gen = yajl_gen_alloc(NULL);
#endif
if (command != NULL) { if (command != NULL) {
int pipe_in[2]; /* pipe we read from */ int pipe_in[2]; /* pipe we read from */