From 7757517220a320eccde47b3fb342e86663d5e105 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 9 Apr 2015 22:19:26 +0200 Subject: [PATCH] terminal/page: drop unneeded DISABLE_WARNING_* The macros in shared/macro.h have been updated to no longer use fixed variable names. This will silence any shadowing-warnings, so drop the DISABLE_WARNING_* annotations. --- src/libsystemd-terminal/term-page.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libsystemd-terminal/term-page.c b/src/libsystemd-terminal/term-page.c index cbd80067347..bac85200f13 100644 --- a/src/libsystemd-terminal/term-page.c +++ b/src/libsystemd-terminal/term-page.c @@ -798,11 +798,9 @@ static inline void line_insert(term_line *line, unsigned int from, unsigned int age); /* adjust fill-state */ - DISABLE_WARNING_SHADOW; line->fill = MIN(line->width, MAX(line->fill + num, from + num)); - REENABLE_WARNING; } else { /* modify head-cell */ term_cell_set(line->cells + from, @@ -871,11 +869,9 @@ void term_line_write(term_line *line, unsigned int pos_x, term_char_t ch, unsign age); /* adjust fill-state */ - DISABLE_WARNING_SHADOW; line->fill = MIN(line->width, MAX(line->fill, pos_x + len)); - REENABLE_WARNING; } }