src/libcharset/libcharset-gsasl.patch

   1 # Patch against libcharset version 1.1
   2 --- /home/jas/src/libiconv/libcharset//lib/localcharset.c       2002-05-10 12:40:10.000000000 +0200
   3 +++ localcharset.c      2002-10-07 00:15:05.000000000 +0200
   4 @@ -102,8 +102,8 @@
   5  static const char * volatile charset_aliases;
   6
   7  /* Return a pointer to the contents of the charset.alias file.  */
   8 -static const char *
   9 -get_charset_aliases ()
  10 +const char *
  11 +_gsasl_locale_get_charset_aliases ()
  12  {
  13    const char *cp;
  14
  15 @@ -239,7 +239,7 @@
  16  STATIC
  17  #endif
  18  const char *
  19 -locale_charset ()
  20 +_gsasl_locale_charset ()
  21  {
  22    const char *codeset;
  23    const char *aliases;
  24 @@ -349,7 +349,7 @@
  25      codeset = "";
  26
  27    /* Resolve alias. */
  28 -  for (aliases = get_charset_aliases ();
  29 +  for (aliases = _gsasl_locale_get_charset_aliases ();
  30         *aliases != '\0';
  31         aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
  32      if (strcmp (codeset, aliases) == 0
  33 --- /home/jas/src/libiconv/libcharset//include/libcharset.h.in  2001-03-27 15:35:32.000000000 +0200
  34 +++ libcharset.h        2002-10-07 00:15:05.000000000 +0200
  35 @@ -30,8 +30,8 @@
  36     The result must not be freed; it is statically allocated.
  37     If the canonical name cannot be determined, the result is a non-canonical
  38     name.  */
  39 -extern const char * locale_charset (void);
  40 -
  41 +extern const char * _gsasl_locale_charset (void);
  42 +extern const char * _gsasl_locale_get_charset_aliases (void);
  43
  44  #ifdef __cplusplus
  45  }