Rename mask to msk

There's something about "mask" which causes the version of GCC we use for the m68k-amigaos build to misinterpret the code
This commit is contained in:
Chris Young 2020-03-06 20:15:52 +00:00
parent 0e6ba162b2
commit 962431dd3d

View File

@ -214,7 +214,7 @@ static inline colour colour_engorge_component(
bool dark,
enum plot_colour_component comp)
{
static const colour mask[PLOT_COLOUR_COMPONENT_ALPHA] = {
static const colour msk[PLOT_COLOUR_COMPONENT_ALPHA] = {
[PLOT_COLOUR_COMPONENT_RED] = 0x0000ff,
[PLOT_COLOUR_COMPONENT_GREEN] = 0x00ff00,
[PLOT_COLOUR_COMPONENT_BLUE] = 0xff0000,
@ -224,7 +224,7 @@ static inline colour colour_engorge_component(
assert(comp < PLOT_COLOUR_COMPONENT_ALPHA);
return (mask[comp] & l) | (~mask[comp] & d);
return (msk[comp] & l) | (~msk[comp] & d);
}