Merge branch 'master' of github.com:tmux/tmux

1 files changed, 1 insertions, 3 deletions

diff --git a/style.c b/style.c
index cec1b894..6e78b3a9 100644
--- a/style.c
+++ b/style.c
@@ -31,10 +31,8 @@ style_parse(const struct grid_cell *defgc, struct grid_cell *gc,
 	struct grid_cell	savedgc;
 	const char		delimiters[] = " ,";
 	char			tmp[32];
-	int			val;
+	int			val, fg, bg, attr, flags;
 	size_t			end;
-	int			fg, bg;
-	u_char			attr, flags;
 
 	if (*in == '\0')
 		return (0);