* iconv/gconv_charset.h (upstr): Add inline keyword, quiets warning.

	* hurd/hurdinit.c (_hurd_init): Use internal name _hurd_new_proc_init.

3 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1783ade4a8..f54baab5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-13  Roland McGrath  <roland@frob.com>
+
+	* iconv/gconv_charset.h (upstr): Add inline keyword, quiets warning.
+
+	* hurd/hurdinit.c (_hurd_init): Use internal name _hurd_new_proc_init.
+
 2002-05-13  Marcus Brinkmann  <marcus@gnu.org>
 
         * hurd/hurdchdir.c (_hurd_change_directory_port_from_name):
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c
index c7f9d4200e..259f8a3547 100644
--- a/hurd/hurdinit.c
+++ b/hurd/hurdinit.c
@@ -51,6 +51,8 @@ _hurd_ports_use (int which, error_t (*operate) (mach_port_t))
 
 DEFINE_HOOK (_hurd_subinit, (void));
 
+__typeof (_hurd_proc_init) _hurd_new_proc_init;	/* below */
+
 /* Initialize the library data structures from the
    ints and ports passed to us by the exec server.
 
@@ -89,7 +91,7 @@ _hurd_init (int flags, char **argv,
 
   /* Tell the proc server we exist, if it does.  */
   if (portarray[INIT_PORT_PROC] != MACH_PORT_NULL)
-    _hurd_proc_init (argv, intarray, intarraysize);
+    _hurd_new_proc_init (argv, intarray, intarraysize);
 
   /* All done with init ints and ports.  */
   __vm_deallocate (__mach_task_self (),
diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 76a92a15ab..f2eab2d4bd 100644
--- 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,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -48,7 +48,7 @@ strip (char *wp, const char *s)
 }
 
 
-static char * __attribute__ ((unused))
+static inline char * __attribute__ ((unused))
 upstr (char *dst, const char *str)
 {
   char *cp = dst;