Update.

1998-04-08 20:06  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath.
	* iconv/gconv_db.c: Use __ protected regex functions.
	* iconv/gconv_simple.c: Use __mbsinit not mbsinit.
	* posix/getopt_init.c: Use __getpid not getpid.
	* posix/regex.c: Rename all global functions to start with __ and
	make old names weak aliases.
	* posix/regex.h: Adopt prototypes for this.
	* stdlib/canonicalize.c: Define __realpath, make canonicalize_file_name
	a weak alias and use __getcwd instead of getcwd.
	* stdlib/stdlib.h: Declare __realpath and __canonicalize_file_name.
	* stdlib/strtod.c: Use __btowc instead of btowc.
	* stdlib/strtol.c: Likewise.
	* sysdeps/libm-ieee754/s_matherr.c: Weaken definition of matherr.
	* sysdeps/unix/sysv/linux/errlist.c: Make sure definitions of sys_nerr
	and sys_errlist are weak.
	* wcsmbs/btowc.c: Define function as __btowc and make btowc weak alias.
	* wcsmbs/mbrtowc.c: Use __mbsinit not mbsinit.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/mbsinit.c: Define function as __mbsinit and make mbsinit
	weak alias.
	* wcsmbs/wchar.h: Declare __btowc and __mbsinit.
	* wctype/wctype.c: Define function as __wctype and make wctype
	weak alias.
	* wctype/wctype.h: Declare __wctype.

8 files changed, 12 insertions, 8 deletions

diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index b627324738..7efe62e5f1 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -25,7 +25,7 @@
 
 
 wint_t
-btowc (c)
+__btowc (c)
      int c;
 {
   char buf[sizeof (wchar_t)];
@@ -67,3 +67,4 @@ btowc (c)
 
   return *(wchar_t *)buf;
 }
+weak_alias (__btowc, btowc)
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 5a52b1dde1..14ca0b0975 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -79,7 +79,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
       if (data.outbufavail > 0 && *(wchar_t *)data.outbuf == L'\0')
 	{
 	  /* The converted character is the NUL character.  */
-	  assert (mbsinit (data.statep));
+	  assert (__mbsinit (data.statep));
 	  result = 0;
 	}
       else
diff --git a/wcsmbs/mbsinit.c b/wcsmbs/mbsinit.c
index 4c9bde9476..727a9bc5e1 100644
--- a/wcsmbs/mbsinit.c
+++ b/wcsmbs/mbsinit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -29,8 +29,9 @@
    value collected so far.  Especially, we don't have different shift
    states.  */
 int
-mbsinit (ps)
+__mbsinit (ps)
      const mbstate_t *ps;
 {
   return ps == NULL || ps->count == 0;
 }
+weak_alias (__mbsinit, mbsinit)
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 9787e97661..d408b39430 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -110,7 +110,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
 	  && ((wchar_t *) dst)[result - 1] == L'\0')
 	{
 	  assert (result > 0);
-	  assert (mbsinit (data.statep));
+	  assert (__mbsinit (data.statep));
 	  *src = NULL;
 	  --result;
 	}
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index 0b5af9bab0..8f9efb3285 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -103,7 +103,7 @@ __mbsrtowcs (dst, src, len, ps)
 	  && ((wchar_t *) dst)[result - 1] == L'\0')
 	{
 	  assert (result > 0);
-	  assert (mbsinit (data.statep));
+	  assert (__mbsinit (data.statep));
 	  *src = NULL;
 	  --result;
 	}
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 719de26e37..48ed81b33b 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -198,6 +198,7 @@ extern wchar_t *wmemset __P ((wchar_t *__s, wchar_t __c, size_t __n));
 
 /* Determine whether C constitutes a valid (one-byte) multibyte
    character.  */
+extern wint_t __btowc __P ((int __c));
 extern wint_t btowc __P ((int __c));
 
 /* Determine whether C corresponds to a member of the extended
@@ -206,6 +207,7 @@ extern int wctob __P ((wint_t __c));
 
 /* Determine whether PS points to an object representing the initial
    state.  */
+extern int __mbsinit __P ((__const mbstate_t *__ps));
 extern int mbsinit __P ((__const mbstate_t *__ps));
 
 /* Write wide character representation of multibyte character pointed
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index 02770ce876..0daf0e3077 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -111,7 +111,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
 	  && dst[data.outbufavail - 1] == '\0')
 	{
 	  assert (data.outbufavail > 0);
-	  assert (mbsinit (data.statep));
+	  assert (__mbsinit (data.statep));
 	  *src = NULL;
 	  --result;
 	}
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 904a003840..7b59fc725a 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -107,7 +107,7 @@ __wcsrtombs (dst, src, len, ps)
 	  && dst[data.outbufavail - 1] == '\0')
 	{
 	  assert (data.outbufavail > 0);
-	  assert (mbsinit (data.statep));
+	  assert (__mbsinit (data.statep));
 	  *src = NULL;
 	  --result;
 	}