diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-collate.c | 2 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index d417c6670b..9d53702984 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1302,7 +1302,7 @@ order for `%.*s' already defined at %s:%Zu"), int cnt; /* Generate the the name. */ - sprintf (buf + preflen, base == 10 ? "%d" : "%x", from); + sprintf (buf + preflen, base == 10 ? "%ld" : "%lx", from); /* Look whether this name is already defined. */ if (find_entry (&collate->seq_table, buf, symlen, diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index f624769b68..704ccfc9b8 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -107,7 +107,7 @@ struct translit_ignore_t /* Type to describe a transliteration include statement. */ -struct translit_include_t +struct translit_include_t { const char *copy_locale; const char *copy_repertoire; @@ -1482,8 +1482,8 @@ charclass_symbolic_ellipsis (struct linereader *ldfile, struct charseq *seq; uint32_t wch; - sprintf (tmp, (base == 10 ? "%.*s%0*d" : "%.*s%0*X"), cp - last_str, - last_str, now->val.str.lenmb - (cp - last_str), from); + sprintf (tmp, (base == 10 ? "%.*s%0*ld" : "%.*s%0*lX"), cp - last_str, + last_str, (int) (now->val.str.lenmb - (cp - last_str)), from); get_character (now, charmap, repertoire, &seq, &wch); |