mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 17:36:08 +02:00
Code

parse_color: drop COLOR_BACKGROUND macro 

Commit 695d95d (parse_color: refactor color storage,
2014-11-20) introduced two macros, COLOR_FOREGROUND and
COLOR_BACKGROUND. The latter conflicts with a system macro
defined on Windows, breaking compilation there.

The simplest solution is to just get rid of these macros
entirely. They are constants that are only used in one place
(since the whole point of 695d95d was to avoid repeating
ourselves). Their main function is to make the magic
character constants more readable, but we can do the same
thing with a comment.

Reported-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-12-09 16:01:26 -05:00 committed by Junio C Hamano
parent bca45fbc1f
commit 71b5984975
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
color.c
View File

@ -144,9 +144,6 @@ int color_parse(const char *value, char *dst)
return color_parse_mem(value, strlen(value), dst);
}
#define COLOR_FOREGROUND '3'
#define COLOR_BACKGROUND '4'
/*
* Write the ANSI color codes for "c" to "out"; the string should
* already have the ANSI escape code in it. "out" should have enough
@ -245,12 +242,14 @@ int color_parse_mem(const char *value, int value_len, char *dst)
if (!color_empty(&fg)) {
if (sep++)
*dst++ = ';';
dst = color_output(dst, &fg, COLOR_FOREGROUND);
/* foreground colors are all in the 3x range */
dst = color_output(dst, &fg, '3');
}
if (!color_empty(&bg)) {
if (sep++)
*dst++ = ';';
dst = color_output(dst, &bg, COLOR_BACKGROUND);
/* background colors are all in the 4x range */
dst = color_output(dst, &bg, '4');
}
*dst++ = 'm';
}