From f0c88e1960b5180e3a943bc9e4feb268ae0e086b Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Fri, 19 Jun 2009 15:11:12 +0300 Subject: [PATCH] dump: One #if for declarations and another for statements --- src/viewer/dump/dump-specialized.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/viewer/dump/dump-specialized.h b/src/viewer/dump/dump-specialized.h index 3fd56014..c1e3433a 100644 --- a/src/viewer/dump/dump-specialized.h +++ b/src/viewer/dump/dump-specialized.h @@ -68,18 +68,26 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd, #ifdef DUMP_COLOR_MODE_16 const unsigned char color1 = document->data[y].chars[x].color[0]; +#elif defined(DUMP_COLOR_MODE_256) + const unsigned char color1 + = document->data[y].chars[x].color[0]; + const unsigned char color2 + = document->data[y].chars[x].color[1]; +#elif defined(DUMP_COLOR_MODE_TRUE) + const unsigned char *const new_foreground + = &document->data[y].chars[x].color[0]; + const unsigned char *const new_background + = &document->data[y].chars[x].color[3]; +#endif /* DUMP_COLOR_MODE_TRUE */ +#ifdef DUMP_COLOR_MODE_16 if (color != color1) { color = color1; if (write_color_16(color, fd, buf, &bptr)) return -1; } -#elif defined(DUMP_COLOR_MODE_256) - const unsigned char color1 - = document->data[y].chars[x].color[0]; - const unsigned char color2 - = document->data[y].chars[x].color[1]; +#elif defined(DUMP_COLOR_MODE_256) if (foreground != color1) { foreground = color1; if (write_color_256("38", foreground, fd, buf, &bptr)) @@ -91,12 +99,8 @@ DUMP_FUNCTION_SPECIALIZED(struct document *document, int fd, if (write_color_256("48", background, fd, buf, &bptr)) return -1; } -#elif defined(DUMP_COLOR_MODE_TRUE) - const unsigned char *const new_foreground - = &document->data[y].chars[x].color[0]; - const unsigned char *const new_background - = &document->data[y].chars[x].color[3]; +#elif defined(DUMP_COLOR_MODE_TRUE) if (memcmp(foreground, new_foreground, 3)) { foreground = new_foreground; if (write_true_color("38", foreground, fd, buf, &bptr)) -- 2.11.4.GIT