Update.

	* include/sys/stat.h: Add prototypes for __lxstat_internal and
	__lxstat64_internal.  Add macros __lxstat and __lxstat64 if not
	NOT_IN_libc.
	* sysdeps/generic/lxstat.c: Use INTDEF for __lxstat.
	* sysdeps/mach/hurd/lxstat.c: Likewise.
	* sysdeps/unix/common/lxstat.c: Likewise.
	* sysdeps/unix/sysv/aix/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/ia64/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: Likewise.
	* sysdeps/generic/lxstat64.c: Use INTDEF for __lxstat64.
	* sysdeps/mach/hurd/lxstat64.c: Likewise.
	* sysdeps/unix/sysv/aix/lxstat64.c: Likewise.
	* sysdeps/unix/sysv/linuxx/lxstat64.c: Likewise.

	* include/wchar.h: Declare __mbrtowc_internal and __mbrlen_internal
	prototypes.  Add __mbrlen and __mbrtowc macros.
	* wcsmbs/mbrlen.c: Use INTDEF for __mbrlen.
	* wcsmbs/mbrtowc.c: Use INTDEF for __mbrtowc.

	* include/unistd.h: Add prototype for __write_internal and add
	__libc_write macro is SHARED.
	* sysdeps/generic/write.c: Use INTDEF for __write.
	* sysdeps/mach/hurd/write.c: Likewise.
	* sysdeps/unix/sysv/aix/write.c: Likewise.
	* sysdeps/unix/syscalls.list: Add __libc_write alias.

	* assert/assert.c: Replace STR_N_SIZE with something usable in
	macro arguments.
	* assert/assert-perr.c: Likewise.

3 files changed, 14 insertions, 4 deletions

diff --git a/sysdeps/generic/lxstat.c b/sysdeps/generic/lxstat.c
index 61ead6ff0f..6d1da8061b 100644
--- a/sysdeps/generic/lxstat.c
+++ b/sysdeps/generic/lxstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995,1996,1997,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,10 +18,13 @@
 
 #include <sys/stat.h>
 
+#undef __lxstat
+
 int
 __lxstat (int version, const char *file, struct stat *buf)
 {
   return __xstat (version, file, buf);
 }
 
+INTDEF(__lxstat)
 weak_alias (__lxstat, _lxstat)
diff --git a/sysdeps/generic/lxstat64.c b/sysdeps/generic/lxstat64.c
index 03fd9fda97..8eb457dc07 100644
--- a/sysdeps/generic/lxstat64.c
+++ b/sysdeps/generic/lxstat64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,8 @@
 #include <stddef.h>
 #include <sys/stat.h>
 
+#undef __lxstat64
+
 /* Get file information about FILE in BUF.
    If FILE is a symbolic link, do not follow it.  */
 int
@@ -34,5 +36,6 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf)
   __set_errno (ENOSYS);
   return -1;
 }
-stub_warning (lstat64)
+INTDEF(__lxstat64)
+stub_warning (__lxstat64)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/write.c b/sysdeps/generic/write.c
index 893af76084..200104b5ea 100644
--- a/sysdeps/generic/write.c
+++ b/sysdeps/generic/write.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +21,9 @@
 #include <unistd.h>
 #include <stddef.h>
 
+#undef __libc_write
+#undef __write
+
 /* Write NBYTES of BUF to FD.  Return the number written, or -1.  */
 ssize_t
 __libc_write (int fd, const void *buf, size_t nbytes)
@@ -44,5 +47,6 @@ __libc_write (int fd, const void *buf, size_t nbytes)
 stub_warning (write)
 
 weak_alias (__libc_write, __write)
+INTDEF(__write)
 weak_alias (__libc_write, write)
 #include <stub-tag.h>