From: Paul Eggert Date: Sun, 23 Sep 2001 06:40:35 +0000 (+0000) Subject: Don't assume we're using the included libintl. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=61170ee8403ead856956207fef048e6eae3563ed;p=chaz%2Ftar Don't assume we're using the included libintl. --- diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 4300df5..37b69aa 100644 --- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -48,6 +48,10 @@ extern int errno; # include #endif +#if HAVE_LANGINFO_CODESET && ! USE_INCLUDED_LIBINTL +# include +#endif + #include "unicodeio.h" /* When we pass a Unicode character to iconv(), we must pass it in a @@ -126,8 +130,18 @@ unicode_to_mb (unsigned int code, if (!initialized) { + const char *charset; + +#if USE_INCLUDED_LIBINTL extern const char *locale_charset PARAMS ((void)); - const char *charset = locale_charset (); + charset = locale_charset (); +#else +# if HAVE_LANGINFO_CODESET + charset = nl_langinfo (CODESET); +# else + charset = ""; +# endif +#endif is_utf8 = !strcmp (charset, UTF8_NAME); #if HAVE_ICONV