From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 17 Jul 2020 10:31:31 -0400 Subject: [4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice. Note: I left behind lcd_bitmap in features.txt, because removing it would require considerable work in the manual and the translations. Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a --- tools/convbdf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tools/convbdf.c') diff --git a/tools/convbdf.c b/tools/convbdf.c index c508bbf2e8..58ab2645b4 100644 --- a/tools/convbdf.c +++ b/tools/convbdf.c @@ -1214,7 +1214,6 @@ int gen_c_source(struct font* pf, char *path) "#include \n" "#include \"config.h\"\n" "#include \"font.h\"\n" - "#ifdef HAVE_LCD_BITMAP\n" "\n" "/* Font information:\n" " name: %s\n" @@ -1426,7 +1425,6 @@ int gen_c_source(struct font* pf, char *path) " 0, /* */\n" " 0, /* */\n" "};\n" - "#endif /* HAVE_LCD_BITMAP */\n" ); return 0; @@ -1440,7 +1438,6 @@ int gen_h_header(struct font* pf, char *path) char buf[256]; char *hdr1 = "/* Generated by convbdf on %s. */\n" - "#ifdef HAVE_LCD_BITMAP\n" "\n" "/* Font information */\n" "#define SYSFONT_NAME %s\n" @@ -1458,8 +1455,7 @@ int gen_h_header(struct font* pf, char *path) "#define SYSFONT_PROPORTIONAL %d\n" "#define SYSFONT_COPYRIGHT %s\n" "#define SYSFONT_BITS_SIZE %d\n" - "\n" - "#endif\n"; + "\n"; ofp = fopen(path, "w"); if (!ofp) { -- cgit v1.2.3