diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/findlocale.c | 4 | ||||
| -rw-r--r-- | locale/localeinfo.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/locale/findlocale.c b/locale/findlocale.c index 162245f137..948dee2a46 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -167,7 +167,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, /* Determine the locale name for which loading succeeded. This information comes from the file name. The form is <path>/<locale>/LC_foo. We must extract the <locale> part. */ - if (((struct locale_data *) locale_file->data)->name == NULL) + if (((const struct locale_data *) locale_file->data)->name == NULL) { char *cp, *endp; @@ -185,7 +185,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, ((struct locale_data *) locale_file->data)->use_translit = 1; /* Increment the usage count. */ - if (((struct locale_data *) locale_file->data)->usage_count + if (((const struct locale_data *) locale_file->data)->usage_count < MAX_USAGE_COUNT) ++((struct locale_data *) locale_file->data)->usage_count; diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 984696e024..d526794e51 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -33,7 +33,7 @@ #include <intl/loadinfo.h> /* For loaded_l10nfile definition. */ /* Magic number at the beginning of a locale data file for CATEGORY. */ -#define LIMAGIC(category) (0x20000828 ^ (category)) +#define LIMAGIC(category) ((unsigned int) (0x20000828 ^ (category))) /* Two special weight constants for the collation data. */ #define IGNORE_CHAR 2 |