Support --with-pkgversion and --with-bugurl.

[thirdparty/glibc.git] / iconv / gconv_charset.h

diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index f2eab2d4bdfac247870e0e383b05b273c8c0baef..c4355c5e3941cc44061e396c559c93b11fb260c2 100644 (file)
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -1,5 +1,5 @@
 /* Charset name normalization.
-   Copyright (C) 2001,02 Free Software Foundation, Inc.
+   Copyright (C) 2001,2002,2003,2004,2005,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -14,24 +14,23 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <ctype.h>
 #include <locale.h>
 
 
-static inline void
+static void
 strip (char *wp, const char *s)
 {
   int slash_count = 0;
 
   while (*s != '\0')
     {
-      if (__isalnum_l (*s, &_nl_C_locobj)
-         || *s == '_' || *s == '-' || *s == '.')
-       *wp++ = __toupper_l (*s, &_nl_C_locobj);
+      if (__isalnum_l (*s, _nl_C_locobj_ptr)
+         || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':')
+       *wp++ = __toupper_l (*s, _nl_C_locobj_ptr);
       else if (*s == '/')
        {
          if (++slash_count == 3)
@@ -48,16 +47,11 @@ strip (char *wp, const char *s)
 }
 
 
-static inline char * __attribute__ ((unused))
+static inline char * __attribute__ ((unused, always_inline))
 upstr (char *dst, const char *str)
 {
   char *cp = dst;
-  while ((*cp++ = __toupper_l (*str++, &_nl_C_locobj)) != '\0')
+  while ((*cp++ = __toupper_l (*str++, _nl_C_locobj_ptr)) != '\0')
     /* nothing */;
   return dst;
 }
-
-
-/* If NAME is an codeset alias expand it.  */
-extern int __gconv_compare_alias (const char *name1, const char *name2)
-     internal_function;