Re: [PATCH] Avoid multiple symbols from locale_charset

[Bruno Haible]

Jack Howarth wrote:
>    We don't seem to have dcigettext.c in the intl directory of
> gcc. The required instances of locale_charset in gcc appears to
> be...

Yes, the code has been rearranged a bit between 0.12.1 and 0.15.

> Index: intl/localcharset.c
> ===================================================================
> --- intl/localcharset.c (revision 117111)
> +++ intl/localcharset.c (working copy)
> @@ -268,7 +268,7 @@
>  STATIC
>  #endif
>  const char *
> -locale_charset ()
> +gcc_locale_charset ()
>  {
>    const char *codeset;
>    const char *aliases;
> Index: intl/localcharset.h
> ===================================================================
> --- intl/localcharset.h (revision 117111)
> +++ intl/localcharset.h (working copy)
> @@ -31,7 +31,7 @@
>     The result must not be freed; it is statically allocated.
>     If the canonical name cannot be determined, the result is a non-canonical
>     name.  */
> -extern const char * locale_charset (void);
> +extern const char * gcc_locale_charset (void);
> 
> 
>  #ifdef __cplusplus
> Index: intl/localename.c
> ===================================================================
> --- intl/localename.c   (revision 117111)
> +++ intl/localename.c   (working copy)
> @@ -376,7 +376,7 @@
> 
>  /* Determine the current locale's name, and canonicalize it into XPG syntax
>       address@hidden
> -   The codeset part in the result is not reliable; the locale_charset()
> +   The codeset part in the result is not reliable; the gcc_locale_charset()
>     should be used for codeset information instead.
>     The result must not be freed; it is statically allocated.  */
> 
> Index: intl/loadmsgcat.c
> ===================================================================
> --- intl/loadmsgcat.c   (revision 117111)
> +++ intl/loadmsgcat.c   (working copy)
> @@ -829,8 +829,8 @@
>                   outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
>  # else
>  #  if HAVE_ICONV
> -                 extern const char *locale_charset PARAMS ((void));
> -                 outcharset = locale_charset ();
> +                 extern const char *gcc_locale_charset PARAMS ((void));
> +                 outcharset = gcc_locale_charset ();
>  #  endif
>  # endif
>                 }
> 
> Would this be okay with you for gcc?

Yes, this looks all right. You can submit this to the GCC people.

Bruno