diff options
| author | Patrick Lam <plam@MIT.EDU> | 2005-09-11 02:16:09 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2005-09-11 02:16:09 +0000 |
| commit | 8245771d5a42dac36024411a0da047b9a7dc42c6 (patch) | |
| tree | 38c715c1dfa12ecc4d0e0773b0f377ade54433f0 /fc-glyphname | |
| parent | 8cb4c56d9925bba17bce32c12f7e09d8f36b2e53 (diff) | |
Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)
Diffstat (limited to 'fc-glyphname')
| -rw-r--r-- | fc-glyphname/fc-glyphname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c index 5b38c72..2c69c2b 100644 --- a/fc-glyphname/fc-glyphname.c +++ b/fc-glyphname/fc-glyphname.c @@ -105,7 +105,7 @@ scan (FILE *f, char *filename) gn = FcAllocGlyphName ((FcChar32) ucs, (FcChar8 *) name); if (!gn) fatal (filename, lineno, "out of memory"); - len = strlen ((FcChar8 *) name); + len = strlen (name); if (len > max_name_len) max_name_len = len; raw[nraw++] = gn; @@ -286,7 +286,7 @@ main (int argc, char **argv) for (i = 0; i < nraw; i++) printf ("static struct { FcChar32 ucs; FcChar8 name[%d]; }" " glyph%d = { 0x%lx, \"%s\" };\n", - (int) strlen (raw[i]->name) + 1, + (int) strlen ((char *) raw[i]->name) + 1, i, (unsigned long) raw[i]->ucs, raw[i]->name); /* |