koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove yajl major version conditionals

Browse Source 
Yajl version ≥ 2 is required.

fixes #1156
This commit is contained in:
Tony Crisci
2014-05-03 21:02:54 -04:00
committed by Michael Stapelberg
parent 22b4215d92
commit 13db562551
17 changed files with 4 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util.c
View File

@ -188,22 +188,14 @@ static char **append_argument(char **original, char *argument) {
char *store_restart_layout(void) {
setlocale(LC_NUMERIC, "C");
#if YAJL_MAJOR >= 2
yajl_gen gen = yajl_gen_alloc(NULL);
#else
yajl_gen gen = yajl_gen_alloc(NULL, NULL);
#endif
dump_node(gen, croot, true);
setlocale(LC_NUMERIC, "");
const unsigned char *payload;
#if YAJL_MAJOR >= 2
size_t length;
#else
unsigned int length;
#endif
y(get_buf, &payload, &length);
/* create a temporary file if one hasn't been specified, or just
@ -241,11 +233,7 @@ char *store_restart_layout(void) {
return NULL;
}
written += n;
#if YAJL_MAJOR >= 2
DLOG("written: %zd of %zd\n", written, length);
#else
DLOG("written: %d of %d\n", written, length);
#endif
}
close(fd);