summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/convbdf.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/tools/convbdf.c b/tools/convbdf.c
index d972cc17ca..ac88ea889b 100644
--- a/tools/convbdf.c
+++ b/tools/convbdf.c
@@ -703,14 +703,8 @@ int gen_c_source(struct font* pf, char *path)
" %s\n"
"*/\n"
"\n"
- "#ifdef SIMULATOR\n"
- "#define FONT_CONST\n"
- "#else\n"
- "#define FONT_CONST const\n"
- "#endif\n"
- "\n"
"/* Font character bitmap data. */\n"
- "static FONT_CONST bitmap_t _font_bits[] = {\n"
+ "static bitmap_t _font_bits[] = {\n"
};
ofp = fopen(path, "w");
@@ -805,7 +799,7 @@ int gen_c_source(struct font* pf, char *path)
if (pf->offset) {
/* output offset table*/
fprintf(ofp, "/* Character->glyph mapping. */\n"
- "static FONT_CONST unsigned long _sysfont_offset[] = {\n");
+ "static unsigned long _sysfont_offset[] = {\n");
for (i=0; i<pf->size; ++i)
fprintf(ofp, " %ld,\t/* (0x%02x) */\n",
@@ -816,7 +810,7 @@ int gen_c_source(struct font* pf, char *path)
/* output width table for proportional fonts*/
if (pf->width) {
fprintf(ofp, "/* Character width data. */\n"
- "static FONT_CONST unsigned char _sysfont_width[] = {\n");
+ "static unsigned char _sysfont_width[] = {\n");
for (i=0; i<pf->size; ++i)
fprintf(ofp, " %d,\t/* (0x%02x) */\n",
@@ -836,15 +830,15 @@ int gen_c_source(struct font* pf, char *path)
sprintf(buf, "0, /* fixed width*/");
fprintf(ofp, "/* Exported structure definition. */\n"
- "FONT_CONST struct font sysfont = {\n"
+ "struct font sysfont = {\n"
" \"%s\",\n"
" %d,\n"
" %d,\n"
" %d,\n"
" %d,\n"
" %d,\n"
- " (bitmap_t *)_font_bits,\n"
- " (unsigned long *)%s\n"
+ " _font_bits,\n"
+ " %s\n"
" %s\n"
" %d,\n"
" sizeof(_font_bits)/sizeof(bitmap_t),\n"