From 4c9a9f24f9b4f0e476bd5daa9b544ed684cd145c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 2 Jun 2014 15:49:44 +0100 Subject: [PATCH] Tidy up the #defines used for setting particular codepoint bits. Align the definitions correctly. #undef them after they're used. --- framebuffer/convert_font.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/framebuffer/convert_font.c b/framebuffer/convert_font.c index 6f5d3c20f..8196d3517 100644 --- a/framebuffer/convert_font.c +++ b/framebuffer/convert_font.c @@ -461,13 +461,13 @@ static bool check_glyph_data_valid(int pos, char c) #define SEVEN_SET ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | \ (1 << 4) | (1 << 5) | (1 << 6)) -#define THREE_SSS ((1 << 0) | (1 << 1) | (1 << 2)) -#define THREE_S_S ((1 << 0) | (1 << 2)) -#define THREE__SS ((1 << 0) | (1 << 1) ) -#define THREE_SS_ ( (1 << 1) | (1 << 2)) -#define THREE_S__ (1 << 2) -#define THREE__S_ (1 << 1) -#define THREE___S (1 << 0) +#define THREE_SSS ((1 << 0) | (1 << 1) | (1 << 2)) +#define THREE_S_S ((1 << 0) | (1 << 2)) +#define THREE__SS ((1 << 0) | (1 << 1) ) +#define THREE_SS_ ( (1 << 1) | (1 << 2)) +#define THREE_S__ (1 << 2) +#define THREE__S_ (1 << 1) +#define THREE___S (1 << 0) uint8_t frag[16][5] = { { THREE_SSS, @@ -606,6 +606,15 @@ void build_codepoint(int id, bool italic, uint8_t *code_point) code_point[15] = SEVEN_SET << shift; } +#undef SEVEN_SET +#undef THREE_SSS +#undef THREE_S_S +#undef THREE__SS +#undef THREE_SS_ +#undef THREE_S__ +#undef THREE__S_ +#undef THREE___S + static bool glyph_is_codepoint(const glyph_entry *e, int id, int style) { bool italic = false;