From 674d28e192680e2ebe9c1e83455ec034e451432f Mon Sep 17 00:00:00 2001
From: Simon Elsbrock <simon@iodev.org>
Date: Wed, 5 Sep 2012 18:39:46 +0200
Subject: modify START_COLOR macro variable naming
Rename val to _val to prevent shadowing warnings due to its common
naming.
---
include/i3status.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/i3status.h b/include/i3status.h
index 1f9da4d..2317936 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -94,10 +94,10 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
#define START_COLOR(colorstr) \
do { \
if (cfg_getbool(cfg_general, "colors")) { \
- const char *val = cfg_getstr(cfg_general, colorstr); \
+ const char *_val = cfg_getstr(cfg_general, colorstr); \
if (output_format == O_I3BAR) { \
yajl_gen_string(json_gen, (const unsigned char *)"color", strlen("color")); \
- yajl_gen_string(json_gen, (const unsigned char *)val, strlen(val)); \
+ yajl_gen_string(json_gen, (const unsigned char *)_val, strlen(_val)); \
} else { \
outwalk += sprintf(outwalk, "%s", color(colorstr)); \
} \
--
cgit v1.2.3