Re: [bug-gnulib] another warning in localcharset.c

[Bruno Haible]

Werner Lemberg wrote:
> During compilation with gcc 3.3.3 I get
>
>   localcharset.c:110: warning: function declaration isn't a prototype

OK, should now be fixed in gnulib CVS:


2006-01-10  Bruno Haible  <address@hidden>

      * localcharset.c: Update from GNU gettext.

*** localcharset.c      14 May 2005 06:03:58 -0000      1.20
--- localcharset.c      10 Jan 2006 13:49:31 -0000
***************
*** 1,6 ****
  /* Determine a canonical name for the current locale's character encoding.
  
!    Copyright (C) 2000-2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,6 ----
  /* Determine a canonical name for the current locale's character encoding.
  
!    Copyright (C) 2000-2006 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 106,112 ****
  
  /* Return a pointer to the contents of the charset.alias file.  */
  static const char *
! get_charset_aliases ()
  {
    const char *cp;
  
--- 106,112 ----
  
  /* Return a pointer to the contents of the charset.alias file.  */
  static const char *
! get_charset_aliases (void)
  {
    const char *cp;
  
***************
*** 248,253 ****
--- 248,254 ----
           "CP1361" "\0" "JOHAB" "\0"
           "CP20127" "\0" "ASCII" "\0"
           "CP20866" "\0" "KOI8-R" "\0"
+          "CP20936" "\0" "GB2312" "\0"
           "CP21866" "\0" "KOI8-RU" "\0"
           "CP28591" "\0" "ISO-8859-1" "\0"
           "CP28592" "\0" "ISO-8859-2" "\0"
***************
*** 258,264 ****
           "CP28597" "\0" "ISO-8859-7" "\0"
           "CP28598" "\0" "ISO-8859-8" "\0"
           "CP28599" "\0" "ISO-8859-9" "\0"
!          "CP28605" "\0" "ISO-8859-15" "\0";
  # endif
  #endif
  
--- 259,272 ----
           "CP28597" "\0" "ISO-8859-7" "\0"
           "CP28598" "\0" "ISO-8859-8" "\0"
           "CP28599" "\0" "ISO-8859-9" "\0"
!          "CP28605" "\0" "ISO-8859-15" "\0"
!          "CP38598" "\0" "ISO-8859-8" "\0"
!          "CP51932" "\0" "EUC-JP" "\0"
!          "CP51936" "\0" "GB2312" "\0"
!          "CP51949" "\0" "EUC-KR" "\0"
!          "CP51950" "\0" "EUC-TW" "\0"
!          "CP54936" "\0" "GB18030" "\0"
!          "CP65001" "\0" "UTF-8" "\0";
  # endif
  #endif
  
***************
*** 278,284 ****
  STATIC
  #endif
  const char *
! locale_charset ()
  {
    const char *codeset;
    const char *aliases;
--- 286,292 ----
  STATIC
  #endif
  const char *
! locale_charset (void)
  {
    const char *codeset;
    const char *aliases;