Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-07-02 19:06:01 +02:00
commit 5cbe2d63c0
1 changed files with 3 additions and 4 deletions

View File

@ -248,8 +248,7 @@ void parse_config_json(char *json) {
void free_colors(struct xcb_color_strings_t *colors) { void free_colors(struct xcb_color_strings_t *colors) {
#define FREE_COLOR(x) \ #define FREE_COLOR(x) \
do { \ do { \
if (colors->x) \ FREE(colors->x); \
free(colors->x); \
} while (0) } while (0)
FREE_COLOR(bar_fg); FREE_COLOR(bar_fg);
FREE_COLOR(bar_bg); FREE_COLOR(bar_bg);