[BZ #40]

[platform/upstream/glibc.git] / iconv / gconv_charset.h

diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 76a92a1..31b545f 100644 (file)
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -1,5 +1,5 @@
 /* Charset name normalization.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -22,7 +22,7 @@
 #include <locale.h>
 
 
-static inline void
+static void
 strip (char *wp, const char *s)
 {
   int slash_count = 0;
@@ -48,7 +48,7 @@ strip (char *wp, const char *s)
 }
 
 
-static char * __attribute__ ((unused))
+static inline char * __attribute__ ((unused, always_inline))
 upstr (char *dst, const char *str)
 {
   char *cp = dst;
@@ -56,8 +56,3 @@ upstr (char *dst, const char *str)
     /* nothing */;
   return dst;
 }
-
-
-/* If NAME is an codeset alias expand it.  */
-extern int __gconv_compare_alias (const char *name1, const char *name2)
-     internal_function;