diff options
author | Jim Meyering <jim@meyering.net> | 2001-09-22 15:08:35 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2001-09-22 15:08:35 +0000 |
commit | 8d45c22c3cda004e6e6b3baa3a24906930f89560 (patch) | |
tree | 1d3662c4091bd7032d521f4228aa18c8da227d9b /lib/localcharset.c | |
parent | 16aef054166879a7f105d064bc9063f354045f55 (diff) | |
download | coreutils-8d45c22c3cda004e6e6b3baa3a24906930f89560.tar.xz |
Update from latest gettext.
Diffstat (limited to 'lib/localcharset.c')
-rw-r--r-- | lib/localcharset.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/localcharset.c b/lib/localcharset.c index 575372dca..61f8f3e85 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -69,16 +69,19 @@ 'charset_aliases' simultaneously, both will produce the same value, and everything will be ok if the two assignments to 'charset_aliases' are atomic. But I don't know what will happen if the two assignments mix. */ +#if __STDC__ != 1 +# define volatile /* empty */ +#endif /* Pointer to the contents of the charset.alias file, if it has already been read, else NULL. Its format is: ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static char * volatile charset_aliases; +static const char * volatile charset_aliases; /* Return a pointer to the contents of the charset.alias file. */ static const char * get_charset_aliases () { - char *cp; + const char *cp; cp = charset_aliases; if (cp == NULL) |