X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flocalcharset.c;h=61f8f3e8529ed4b5de04fad2f0f84642c14cf0af;hb=d36212cb0a461bc3f063ecbcb1c4d88316eaa397;hp=575372dca4472404c5f0c7a76ba0ced72fe9c184;hpb=4028e63dd21b964fdcd76448c973cbad683982e4;p=gnulib.git 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)