update from main archive 961116cvs/libc-961119 cvs/libc-961118 cvs/libc-961117

Sun Nov 17 03:13:57 1996 Ulrich Drepper <drepper@cygnus.com> * db/makedb.c: Update and reformat copyright. * elf/Makefile: Likewise. * elf/dl-close.c: Likewise. * elf/dl-debug.c: Likewise. * elf/dl-deps.c: Likewise. * elf/dl-error.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-init.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-minimal.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-symbol.c: Likewise. * elf/dladdr.c: Likewise. * elf/dlclose.c: Likewise. * elf/dlerror.c: Likewise. * elf/dlopen.c: Likewise. * elf/dlsym.c: Likewise. * elf/do-rel.h: Likewise. * elf/dynamic-link.h: Likewise. * elf/eval.c: Likewise. * elf/rtld.c: Likewise. * inet/ether_hton.c: Likewise. * inet/ether_ntoh.c: Likewise. * inet/ether_line.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/Makefile (+gccwarn): Remove definition. Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c to `-w'. * inet/aliases.h: Add C++ protection. * inet/ether_hton.c: Add prototype for __nss_ethers_lookup. (ether_hostton): Remove unused variable result. * inet/ether_ntoh.c: Likewise. * inet/ether_line.c: Include <ctype.h> and <string.h>. * inet/getnetgrent_r.c: Include <stdlib.h>. Use casts to prevent warnings. (innetgr): Initialize `known' and `needed'. * inet/inet_net.c: Make local variable `i' of type u_int32_t. * nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't return NULL. Instead set *RESULT to NULL and return -1. * nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise. (SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything. * nss/nss_files/files-alias.c: Debug function. I didn't worked at all before. Sat Nov 16 15:25:34 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/readv.c: Don't use PTR anymore. * sysdeps/posix/writev.c: Likewise. * version.h (VERSION): Bump to 1.98. * nss/db-Makefile: Generate lines for getXXXent iteration. * sysdeps/alpha/Dist: Don't distribute removed files divlu.S, divqu.S, remlu.S, and remqu.S. Fri Nov 15 08:55:54 1996 Andreas Jaeger <aj@arthur.pfalz.de> * posix/unistd.h: Correct typo in documentation. Thu Nov 14 18:08:14 1996 a sun <asun@zoology.washington.edu> * inet/netinet/tcp.h: Use __ protected versions instead of BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly. Sat Nov 16 13:44:55 1996 Ulrich Drepper <drepper@cygnus.com> * intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that references in libc.so are not anymore undefined. Sat Nov 16 18:17:36 1996 NIIBE Yutaka <gniibe@mri.co.jp> * io/utime.h: Rename second parameter for utime to prevent warning for -Wshadow. * dirent/dirent.h: Same here for scandir prototype. * math/mathcalls.h: Likewise for frexp and ldexp. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport. Sat Nov 16 03:49:27 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/tst-strtod.c: Add test for error case below. Sat Nov 16 03:48:39 1996 Wolfram Gloger <Wolfram.Gloger@dent.med.uni-muenchen.de> * stdlib/strtod.c: Recognize numbers like 0e-19. Fri Nov 15 08:38:43 1996 Andreas Jaeger <aj@arthur.pfalz.de> * time/Makefile ($(installed-localtime-file)): Fix path to rellns-sh. * Makefile: Don't generate and install gnu/lib-names.h if $(build-shared) is not `yes'. Thu Nov 14 09:23:58 1996 H.J. Lu (hjl@gnu.ai.mit.edu) * sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h. * Makerules (REAL_MAKE_VERSION): New, use it instead of MAKE_VERSION. Thu Nov 14 22:10:43 1996 Ulrich Drepper <drepper@cygnus.com> * nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo. * nss/getXXent_r.c: Fix typo. Set correct return value when no further service is available. Thu Nov 14 17:48:13 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_put.c: Add cast to avoid warning. * db/recno/rec_close.c: Likewise. * db/mpool/mpool.c: Likewise. * db/hash/hash_bigkey.h: Likewise. * db/hash/hash.c: Likewise. * db/btree/bt_split.c: Likewise. * db/btree/bt_put.c: Likewise. Thu Nov 14 14:11:44 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/dirent.h: Update copyright. * elf/elf.h: Likewise. * elf/link.h: Likewise. * gmon/sys/gmon_out.h: Likewise. * gnu-versions.h: Likewise. * intl/libintl.h: Likewise. * io/fcntl.h: Likewise. * io/ftw.h: Likewise. * io/sys/statfs.h: Likewise. * io/utime.h: Likewise. * locale/langinfo.h: Likewise. * malloc/malloc.h: Likewise. * malloc/obstack.h: Likewise. * misc/ar.h: Likewise. * misc/error.h: Likewise. * misc/mntent.h: Likewise. * misc/sgtty.h: Likewise. * misc/sys/cdefs.h: Likewise. * misc/sys/dir.h: Likewise. * misc/sys/file.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/ustat.h: Likewise. * posix/fnmatch.h: Likewise. * posix/getopt.h: Likewise. * posix/glob.h: Likewise. * posix/posix2_lim.h: Likewise. * posix/regex.h: Likewise. * posix/sys/times.h: Likewise. * posix/sys/types.h: Likewise. * posix/sys/utsname.h: Likewise. * posix/tar.h: Likewise. * posix/wordexp.h: Likewise. * resource/sys/resource.h: Likewise. * resource/sys/vlimit.h: Likewise. * resource/sys/vtimes.h: Likewise. * socket/sys/socket.h: Likewise. * socket/sys/un.h: Likewise. * stdio-common/printf.h: Likewise. * stdlib/alloca.h: Likewise. * string/argz.h: Likewise. * string/endian.h: Likewise. * string/envz.h: Likewise. * string/memory.h: Likewise. * string/strings.h: Likewise. * sysdeps/generic/crypt.h: Likewise. * sysdeps/generic/direntry.h: Likewise. * sysdeps/generic/gnu/types.h: Likewise. * sysdeps/generic/ioctl-types.h: Likewise. * sysdeps/generic/netinet/in.h: Likewise. * sysdeps/generic/resourcebits.h: Likewise. * sysdeps/generic/sigset.h: Likewise. * sysdeps/generic/sockaddrcom.h: Likewise. * sysdeps/generic/sys/mman.h: Likewise. * sysdeps/generic/sys/ptrace.h: Likewise. * sysdeps/generic/termbits.h: Likewise. * sysdeps/generic/waitstatus.h: Likewise. * sysdeps/ieee754/huge_val.h: Likewise. * sysdeps/ieee754/nan.h: Likewise. * sysdeps/mach/hurd/local_lim.h: Likewise. * sysdeps/mach/hurd/statbuf.h: Likewise. * sysdeps/stub/huge_val.h: Likewise. * sysdeps/stub/libc-lock.h: Likewise. * sysdeps/stub/signum.h: Likewise. * sysdeps/stub/statbuf.h: Likewise. * sysdeps/stub/waitflags.h: Likewise. * sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise. * sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/signum.h: Likewise. * sysdeps/unix/bsd/statbuf.h: Likewise. * sysdeps/unix/bsd/sun/signum.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/bsd/waitflags.h: Likewise. * sysdeps/unix/sysv/irix4/signum.h: Likewise. * sysdeps/unix/sysv/irix4/statbuf.h: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise. * sysdeps/unix/sysv/linux/direntry.h: Likewise. * sysdeps/unix/sysv/linux/gnu/types.h: Likewise. * sysdeps/unix/sysv/linux/ioctl-types.h: Likewise. * sysdeps/unix/sysv/linux/local_lim.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. * sysdeps/unix/sysv/linux/resourcebits.h: Likewise. * sysdeps/unix/sysv/linux/signum.h: Likewise. * sysdeps/unix/sysv/linux/statbuf.h: Likewise. * sysdeps/unix/sysv/linux/sys/io.h: Likewise. * sysdeps/unix/sysv/linux/sys/klog.h: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise. * sysdeps/unix/sysv/linux/syscall.h: Likewise. * sysdeps/unix/sysv/linux/termbits.h: Likewise. * sysdeps/unix/sysv/local_lim.h: Likewise. * sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise. * sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise. * sysdeps/unix/sysv/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise. * sysdeps/unix/sysv/sysv4/waitflags.h: Likewise. * sysdeps/vax/huge_val.h: Likewise. * values.h: Likewise. Thu Nov 14 04:22:41 1996 Ulrich Drepper <drepper@cygnus.com> * malloc/obstack.h: Use memcpy instead of bcopy and define a macro `memcpy' using bcopy if memcpy is not available. * manual/stdio.texi: Correct description of printf customization. The argument info function is not optional anymore and the interface for `printf_function' also changed. * manual/examples/rprintf.c: Define and use argument info function. * stdio-common/printf.h (struct printf_info): Change type for field `pad' to wchar_t. Correct comment for `register_printf_function'. * nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno to reentrant function. Instead use temporary variable and set h_errno if an error occured. Reported by NIIBE Yutaka. are no bits set in the masks. Reported by baldazzi@csr.unibo.it.
author: Ulrich Drepper <drepper@redhat.com> 1996-11-17 03:15:52 +0000
committer: Ulrich Drepper <drepper@redhat.com> 1996-11-17 03:15:52 +0000
commit: afd4eb3759746286f7cccfbe27c45d52eb49b7b3 (patch)
tree: abc5229e708babe17c04a7ee83f38c2549a65164
parent: \indexbreaks, \realunder, \multitable, \footnotezzz. (diff)
download: glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.tar.gz
glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.tar.bz2
glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.zip
54 files changed, 918 insertions, 628 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b7a667bd3..88a5be3b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,259 @@
+Sun Nov 17 03:13:57 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* db/makedb.c: Update and reformat copyright.
+	* elf/Makefile: Likewise.
+	* elf/dl-close.c: Likewise.
+	* elf/dl-debug.c: Likewise.
+	* elf/dl-deps.c: Likewise.
+	* elf/dl-error.c: Likewise.
+	* elf/dl-fini.c: Likewise.
+	* elf/dl-init.c: Likewise.
+	* elf/dl-load.c: Likewise.
+	* elf/dl-lookup.c: Likewise.
+	* elf/dl-minimal.c: Likewise.
+	* elf/dl-object.c: Likewise.
+	* elf/dl-open.c: Likewise.
+	* elf/dl-reloc.c: Likewise.
+	* elf/dl-runtime.c: Likewise.
+	* elf/dl-support.c: Likewise.
+	* elf/dl-symbol.c: Likewise.
+	* elf/dladdr.c: Likewise.
+	* elf/dlclose.c: Likewise.
+	* elf/dlerror.c: Likewise.
+	* elf/dlopen.c: Likewise.
+	* elf/dlsym.c: Likewise.
+	* elf/do-rel.h: Likewise.
+	* elf/dynamic-link.h: Likewise.
+	* elf/eval.c: Likewise.
+	* elf/rtld.c: Likewise.
+	* inet/ether_hton.c: Likewise.
+	* inet/ether_ntoh.c: Likewise.
+	* inet/ether_line.c: Likewise.
+	* inet/getnetgrent_r.c: Likewise.
+
+	* inet/Makefile (+gccwarn): Remove definition.
+	Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c
+	to `-w'.
+	* inet/aliases.h: Add C++ protection.
+	* inet/ether_hton.c: Add prototype for __nss_ethers_lookup.
+	(ether_hostton): Remove unused variable result.
+	* inet/ether_ntoh.c: Likewise.
+	* inet/ether_line.c: Include <ctype.h> and <string.h>.
+	* inet/getnetgrent_r.c: Include <stdlib.h>.
+	Use casts to prevent warnings.
+	(innetgr): Initialize `known' and `needed'.
+	* inet/inet_net.c: Make local variable `i' of type u_int32_t.
+	* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't
+	return NULL.  Instead set *RESULT to NULL and return -1.
+	* nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise.
+	(SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything.
+
+	* nss/nss_files/files-alias.c: Debug function.  I didn't worked at
+	all before.
+
+Sat Nov 16 15:25:34 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/posix/readv.c: Don't use PTR anymore.
+	* sysdeps/posix/writev.c: Likewise.
+
+	* version.h (VERSION): Bump to 1.98.
+
+	* nss/db-Makefile: Generate lines for getXXXent iteration.
+
+	* sysdeps/alpha/Dist: Don't distribute removed files divlu.S,
+	divqu.S, remlu.S, and remqu.S.
+
+Fri Nov 15 08:55:54 1996  Andreas Jaeger  <aj@arthur.pfalz.de>
+
+	* posix/unistd.h: Correct typo in documentation.
+
+Thu Nov 14 18:08:14 1996  a sun  <asun@zoology.washington.edu>
+
+	* inet/netinet/tcp.h: Use __ protected versions instead of
+	BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly.
+
+Sat Nov 16 13:44:55 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that
+	references in libc.so are not anymore undefined.
+
+Sat Nov 16 18:17:36 1996  NIIBE Yutaka  <gniibe@mri.co.jp>
+
+	* io/utime.h: Rename second parameter for utime to prevent warning
+	for -Wshadow.
+	* dirent/dirent.h: Same here for scandir prototype.
+	* math/mathcalls.h: Likewise for frexp and ldexp.
+	* sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport.
+
+Sat Nov 16 03:49:27 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* stdlib/tst-strtod.c: Add test for error case below.
+
+Sat Nov 16 03:48:39 1996  Wolfram Gloger  <Wolfram.Gloger@dent.med.uni-muenchen.de>
+
+	* stdlib/strtod.c: Recognize numbers like 0e-19.
+
+Fri Nov 15 08:38:43 1996  Andreas Jaeger  <aj@arthur.pfalz.de>
+
+	* time/Makefile ($(installed-localtime-file)): Fix path to
+	rellns-sh.
+
+	* Makefile: Don't generate and install gnu/lib-names.h if
+	$(build-shared) is not `yes'.
+
+Thu Nov 14 09:23:58 1996  H.J. Lu (hjl@gnu.ai.mit.edu)
+
+	* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend
+	on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h.
+
+	* Makerules (REAL_MAKE_VERSION): New, use it instead of
+	MAKE_VERSION.
+
+Thu Nov 14 22:10:43 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo.
+	* nss/getXXent_r.c: Fix typo.  Set correct return value when
+	no further service is available.
+
+Thu Nov 14 17:48:13 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* db/recno/rec_put.c: Add cast to avoid warning.
+	* db/recno/rec_close.c: Likewise.
+	* db/mpool/mpool.c: Likewise.
+	* db/hash/hash_bigkey.h: Likewise.
+	* db/hash/hash.c: Likewise.
+	* db/btree/bt_split.c: Likewise.
+	* db/btree/bt_put.c: Likewise.
+
+Thu Nov 14 14:11:44 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dirent/dirent.h: Update copyright.
+	* elf/elf.h: Likewise.
+	* elf/link.h: Likewise.
+	* gmon/sys/gmon_out.h: Likewise.
+	* gnu-versions.h: Likewise.
+	* intl/libintl.h: Likewise.
+	* io/fcntl.h: Likewise.
+	* io/ftw.h: Likewise.
+	* io/sys/statfs.h: Likewise.
+	* io/utime.h: Likewise.
+	* locale/langinfo.h: Likewise.
+	* malloc/malloc.h: Likewise.
+	* malloc/obstack.h: Likewise.
+	* misc/ar.h: Likewise.
+	* misc/error.h: Likewise.
+	* misc/mntent.h: Likewise.
+	* misc/sgtty.h: Likewise.
+	* misc/sys/cdefs.h: Likewise.
+	* misc/sys/dir.h: Likewise.
+	* misc/sys/file.h: Likewise.
+	* misc/sys/ioctl.h: Likewise.
+	* misc/sys/ustat.h: Likewise.
+	* posix/fnmatch.h: Likewise.
+	* posix/getopt.h: Likewise.
+	* posix/glob.h: Likewise.
+	* posix/posix2_lim.h: Likewise.
+	* posix/regex.h: Likewise.
+	* posix/sys/times.h: Likewise.
+	* posix/sys/types.h: Likewise.
+	* posix/sys/utsname.h: Likewise.
+	* posix/tar.h: Likewise.
+	* posix/wordexp.h: Likewise.
+	* resource/sys/resource.h: Likewise.
+	* resource/sys/vlimit.h: Likewise.
+	* resource/sys/vtimes.h: Likewise.
+	* socket/sys/socket.h: Likewise.
+	* socket/sys/un.h: Likewise.
+	* stdio-common/printf.h: Likewise.
+	* stdlib/alloca.h: Likewise.
+	* string/argz.h: Likewise.
+	* string/endian.h: Likewise.
+	* string/envz.h: Likewise.
+	* string/memory.h: Likewise.
+	* string/strings.h: Likewise.
+	* sysdeps/generic/crypt.h: Likewise.
+	* sysdeps/generic/direntry.h: Likewise.
+	* sysdeps/generic/gnu/types.h: Likewise.
+	* sysdeps/generic/ioctl-types.h: Likewise.
+	* sysdeps/generic/netinet/in.h: Likewise.
+	* sysdeps/generic/resourcebits.h: Likewise.
+	* sysdeps/generic/sigset.h: Likewise.
+	* sysdeps/generic/sockaddrcom.h: Likewise.
+	* sysdeps/generic/sys/mman.h: Likewise.
+	* sysdeps/generic/sys/ptrace.h: Likewise.
+	* sysdeps/generic/termbits.h: Likewise.
+	* sysdeps/generic/waitstatus.h: Likewise.
+	* sysdeps/ieee754/huge_val.h: Likewise.
+	* sysdeps/ieee754/nan.h: Likewise.
+	* sysdeps/mach/hurd/local_lim.h: Likewise.
+	* sysdeps/mach/hurd/statbuf.h: Likewise.
+	* sysdeps/stub/huge_val.h: Likewise.
+	* sysdeps/stub/libc-lock.h: Likewise.
+	* sysdeps/stub/signum.h: Likewise.
+	* sysdeps/stub/statbuf.h: Likewise.
+	* sysdeps/stub/waitflags.h: Likewise.
+	* sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise.
+	* sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise.
+	* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
+	* sysdeps/unix/bsd/signum.h: Likewise.
+	* sysdeps/unix/bsd/statbuf.h: Likewise.
+	* sysdeps/unix/bsd/sun/signum.h: Likewise.
+	* sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise.
+	* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
+	* sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise.
+	* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
+	* sysdeps/unix/bsd/waitflags.h: Likewise.
+	* sysdeps/unix/sysv/irix4/signum.h: Likewise.
+	* sysdeps/unix/sysv/irix4/statbuf.h: Likewise.
+	* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise.
+	* sysdeps/unix/sysv/linux/direntry.h: Likewise.
+	* sysdeps/unix/sysv/linux/gnu/types.h: Likewise.
+	* sysdeps/unix/sysv/linux/ioctl-types.h: Likewise.
+	* sysdeps/unix/sysv/linux/local_lim.h: Likewise.
+	* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
+	* sysdeps/unix/sysv/linux/resourcebits.h: Likewise.
+	* sysdeps/unix/sysv/linux/signum.h: Likewise.
+	* sysdeps/unix/sysv/linux/statbuf.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/io.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/klog.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise.
+	* sysdeps/unix/sysv/linux/syscall.h: Likewise.
+	* sysdeps/unix/sysv/linux/termbits.h: Likewise.
+	* sysdeps/unix/sysv/local_lim.h: Likewise.
+	* sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise.
+	* sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
+	* sysdeps/unix/sysv/signum.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/signum.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/sigset.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise.
+	* sysdeps/unix/sysv/sysv4/waitflags.h: Likewise.
+	* sysdeps/vax/huge_val.h: Likewise.
+	* values.h: Likewise.
+
+Thu Nov 14 04:22:41 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* malloc/obstack.h: Use memcpy instead of bcopy and define a macro
+	`memcpy' using bcopy if memcpy is not available.
+
+	* manual/stdio.texi: Correct description of printf customization.
+	The argument info function is not optional anymore and the
+	interface for `printf_function' also changed.
+	* manual/examples/rprintf.c: Define and use argument info function.
+
+	* stdio-common/printf.h (struct printf_info): Change type for field
+	`pad' to wchar_t.
+	Correct comment for `register_printf_function'.
+
+	* nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno
+	to reentrant function.  Instead use temporary variable and set
+	h_errno if an error occured.
+	Reported by NIIBE Yutaka.
+
 Fri Nov 15 12:27:25 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/statbuf.h (S_IPTRANS, S_IATRANS, S_IROOT,
@@ -29,7 +285,7 @@ Thu Nov 14 12:53:16 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 	prototyped definition.
 
 	* sysdeps/mach/hurd/select.c (__select): Deal properly when there
-	are no bits set in the masks.  Reported by baldazzi@csr.unibo.it. 
+	are no bits set in the masks.  Reported by baldazzi@csr.unibo.it.
 
 Thu Nov 14 02:00:33 1996  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/Makefile b/Makefile
index 4b9dac757f..41fe4c3536 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ before-compile = $(objpfx)version-info.h
 echo-headers: subdir_echo-headers
 
 # What to install.
-install-others = $(includedir)/stubs.h $(includedir)/gnu/lib-names.h
+install-others = $(includedir)/stubs.h
 
 ifeq (yes,$(gnu-ld))
 libc-init = set-init
@@ -176,6 +176,8 @@ $(includedir)/stubs.h: subdir_install
 	else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
 	rm -f $(objpfx)stubs.h
 
+ifeq (yes, $(build-shared))
+
 # Like stubs.h the gnu/lib-names.h header is not used while building the
 # libc itself.  So we generate it while installing.
 $(includedir)/gnu/lib-names.h: $(common-objpfx)soversions.mk
@@ -198,6 +200,9 @@ $(includedir)/gnu/lib-names.h: $(common-objpfx)soversions.mk
 	then echo 'gnu/lib-names.h unchanged'; \
 	else $(INSTALL_DATA) $(objpfx)lib-names.h $@; fi
 	rm -f $(objpfx)lib-names.h
+
+install-others += $(includedir)/gnu/lib-names.h
+endif
 
 # This makes the Info or DVI file of the documentation from the Texinfo source.
 .PHONY: info dvi
diff --git a/db/makedb.c b/db/makedb.c
index eb17a2254e..4703121dea 100644
--- a/db/makedb.c
+++ b/db/makedb.c
@@ -1,22 +1,22 @@
 /* makedb -- create simple DB database from textual input.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <db.h>
 #include <ctype.h>
diff --git a/dirent/dirent.h b/dirent/dirent.h
index 044fc5a16c..22ddcbbf6d 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -157,13 +157,13 @@ extern void seekdir __P ((DIR *__dirp, __off_t __pos));
 /* Return the current position of DIRP.  */
 extern __off_t telldir __P ((DIR *__dirp));
 
-/* Scan the directory DIR, calling SELECT on each directory entry.
+/* Scan the directory DIR, calling SELECTOR on each directory entry.
    Entries for which SELECT returns nonzero are individually malloc'd,
    sorted using qsort with CMP, and collected in a malloc'd array in
    *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
 extern int scandir __P ((__const char *__dir,
 			 struct dirent ***__namelist,
-			 int (*__select) __P ((struct dirent *)),
+			 int (*__selector) __P ((struct dirent *)),
 			 int (*__cmp) __P ((__const __ptr_t,
 					    __const __ptr_t))));
 
diff --git a/elf/Makefile b/elf/Makefile
index dcca90411f..58b3a90f20 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -14,9 +14,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 subdir		:= elf
 
@@ -85,7 +85,7 @@ endef
 CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"'
 
 ifneq (ld.so, $(rtld-installed-name))
-# Make sure ld-gnu.so.1 exists in the build directory so we can link
+# Make sure ld.so.1 exists in the build directory so we can link
 # against it.
 $(objpfx)$(rtld-installed-name): $(objpfx)ld.so
 	rm -f $@
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 0a16d69f0d..7e851cd0af 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -1,21 +1,21 @@
 /* _dl_close -- Close a shared object opened by `_dl_open'.
-Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <dlfcn.h>
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index 1c4e3c76aa..38e0e38420 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -1,21 +1,21 @@
 /* Communicate dynamic linker state to the debugger at runtime.
-Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c310a5b82d..977b3237aa 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -1,21 +1,21 @@
 /* Load the dependencies of a mapped object.
-Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <errno.h>
diff --git a/elf/dl-error.c b/elf/dl-error.c
index 40ded4f1d2..e0a73471a4 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -1,21 +1,21 @@
 /* Error handling for runtime dynamic linker.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 9f4233aca0..5af43d3f5b 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -1,21 +1,21 @@
 /* Call the termination functions of loaded shared objects.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 
diff --git a/elf/dl-init.c b/elf/dl-init.c
index 6259c35235..30d00164e9 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -1,21 +1,21 @@
 /* Return the next shared object initializer function not yet run.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1a86cccb89..7dc6d91a02 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1,21 +1,21 @@
 /* _dl_map_object -- Map in a shared object's segments from the file.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <sys/types.h>
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index e57887bfdd..f35bbbe967 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -1,21 +1,21 @@
 /* Look up a symbol in the loaded objects.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index dd5fa200dd..d83620d02b 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -1,21 +1,21 @@
 /* Minimal replacements for basic facilities used in the dynamic linker.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 851d133df3..6986dc34d3 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -1,21 +1,21 @@
 /* Storage management for the chain of loaded shared objects.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <assert.h>
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 8f4f9f5015..fe9f8ff017 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -1,21 +1,21 @@
 /* Load a shared object at runtime, relocate it, and run its initializer.
-Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <dlfcn.h>
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index fa424a4d01..e299e523ee 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -1,21 +1,21 @@
 /* Relocate a shared object and resolve its references to other loaded objects.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <sys/types.h>
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 2a186f2d0b..088ff64c6e 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -1,21 +1,21 @@
 /* On-demand PLT fixup for shared objects.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <stddef.h>
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 03c9d9c5c7..35710a0a74 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -1,21 +1,21 @@
 /* Support for dynamic linking code in static libc.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <assert.h>
 #include <fcntl.h>
diff --git a/elf/dl-symbol.c b/elf/dl-symbol.c
index 04dd122ef1..e27018c7d4 100644
--- a/elf/dl-symbol.c
+++ b/elf/dl-symbol.c
@@ -1,21 +1,21 @@
 /* Look up a symbol's run-time value in the scope of a loaded object.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/dladdr.c b/elf/dladdr.c
index fa78d8fc02..59e9783760 100644
--- a/elf/dladdr.c
+++ b/elf/dladdr.c
@@ -1,21 +1,21 @@
 /* dladdr -- Locate the shared object symbol nearest a given address.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
@@ -83,4 +83,3 @@ dladdr (void *address, Dl_info *info)
 
   return 1;
 }
-
diff --git a/elf/dlclose.c b/elf/dlclose.c
index a5c8e7c17e..6a142119f7 100644
--- a/elf/dlclose.c
+++ b/elf/dlclose.c
@@ -1,21 +1,21 @@
 /* dlclose -- Close a handle opened by `dlopen'.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <dlfcn.h>
@@ -30,4 +30,3 @@ dlclose (void *handle)
 
   return _dlerror_run (doit) ? -1 : 0;
 }
-
diff --git a/elf/dlerror.c b/elf/dlerror.c
index 9b78e47a57..466aa2811e 100644
--- a/elf/dlerror.c
+++ b/elf/dlerror.c
@@ -1,21 +1,21 @@
 /* dlerror -- Return error detail for failing <dlfcn.h> functions.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <dlfcn.h>
diff --git a/elf/dlopen.c b/elf/dlopen.c
index 9de787dd68..7ad3429164 100644
--- a/elf/dlopen.c
+++ b/elf/dlopen.c
@@ -1,21 +1,21 @@
 /* dlopen -- Load a shared object at run time.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/dlsym.c b/elf/dlsym.c
index 98e36290c2..edfe1c6cbb 100644
--- a/elf/dlsym.c
+++ b/elf/dlsym.c
@@ -1,21 +1,21 @@
 /* dlsym -- Look up a symbol in a shared object loaded by `dlopen'.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
 #include <link.h>
diff --git a/elf/do-rel.h b/elf/do-rel.h
index 25da59252f..a7b7a60c66 100644
--- a/elf/do-rel.h
+++ b/elf/do-rel.h
@@ -1,21 +1,21 @@
 /* Do relocations for ELF dynamic linking.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* This file may be included twice, to define both
    `elf_dynamic_do_rel' and `elf_dynamic_do_rela'.  */
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index e4bb022dcf..97eb6a58c8 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -1,21 +1,21 @@
 /* Inline functions for dynamic linking.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <elf.h>
 #include <dl-machine.h>
diff --git a/elf/eval.c b/elf/eval.c
index 03b903b76f..0fb6751a95 100644
--- a/elf/eval.c
+++ b/elf/eval.c
@@ -1,21 +1,21 @@
 /* You don't really want to know what this hack is for.
-Copyright (C) 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   Copyright (C) 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/elf/rtld.c b/elf/rtld.c
index b3018fb87f..0ce903a036 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,21 +1,21 @@
 /* Run time dynamic linker.
-Copyright (C) 1995, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   Copyright (C) 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
 #include <stddef.h>
diff --git a/inet/Makefile b/inet/Makefile
index dd502110a8..96f19923da 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -46,6 +46,8 @@ routines := ntohl ntohs htonl htons		\
 	    getaliasent_r getaliasent getaliasname getaliasname_r
 
 # No warnings about losing BSD code.
-override +gccwarn := -w
+CFLAGS-rcmd.c = -w
+CFLAGS-rexec.c = -w
+CFLAGS-ruserpass.c = -w
 
 include ../Rules
diff --git a/inet/aliases.h b/inet/aliases.h
index 94895083b7..ebf3387c72 100644
--- a/inet/aliases.h
+++ b/inet/aliases.h
@@ -24,6 +24,8 @@
 #include <sys/types.h>
 
 
+__BEGIN_DECLS
+
 /* Structure to represent one entry of the alias data base.  */
 struct aliasent
 {
@@ -57,5 +59,6 @@ extern int getaliasbyname_r __P ((__const char *__name,
 				  struct aliasent **__result));
 #endif /* reentrant */
 
+__END_DECLS
 
 #endif /* aliases.h */
diff --git a/inet/ether_hton.c b/inet/ether_hton.c
index fb62d2dab5..c4149a0616 100644
--- a/inet/ether_hton.c
+++ b/inet/ether_hton.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
@@ -35,6 +35,10 @@ struct etherent
 /* Type of the lookup function we need here.  */
 typedef int (*lookup_function) (const char *, struct etherent *, char *, int);
 
+/* The lookup function for the first entry of this service.  */
+extern int __nss_ethers_lookup (service_user **nip, const char *name,
+				void **fctp);
+
 
 int
 ether_hostton (const char *hostname, struct ether_addr *addr)
@@ -44,7 +48,6 @@ ether_hostton (const char *hostname, struct ether_addr *addr)
   service_user *nip;
   lookup_function fct;
   int no_more;
-  int result;
   enum nss_status status = NSS_STATUS_UNAVAIL;
   struct etherent etherent;
 
diff --git a/inet/ether_line.c b/inet/ether_line.c
index 1400f5ae96..9e9f7368b9 100644
--- a/inet/ether_line.c
+++ b/inet/ether_line.c
@@ -1,22 +1,24 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
+#include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c
index 26a4e471ad..61bc0f1de6 100644
--- a/inet/ether_ntoh.c
+++ b/inet/ether_ntoh.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
@@ -36,6 +36,10 @@ struct etherent
 typedef int (*lookup_function) (const struct ether_addr *, struct etherent *,
 				char *, int);
 
+/* The lookup function for the first entry of this service.  */
+extern int __nss_ethers_lookup (service_user **nip, const char *name,
+				void **fctp);
+
 
 int
 ether_ntohost (char *hostname, const struct ether_addr *addr)
@@ -45,7 +49,6 @@ ether_ntohost (char *hostname, const struct ether_addr *addr)
   service_user *nip;
   lookup_function fct;
   int no_more;
-  int result;
   enum nss_status status = NSS_STATUS_UNAVAIL;
   struct etherent etherent;
 
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 5600716d69..ffa45193a9 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -1,23 +1,24 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <libc-lock.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <string.h>
 #include "netgroup.h"
 #include "nsswitch.h"
@@ -34,11 +35,11 @@ static service_user *nip;
    kept in this structure.  */
 static struct __netgrent dataset;
 
-
 /* The lookup function for the first entry of this service.  */
 extern int __nss_netgroup_lookup (service_user **nip, const char *name,
 				  void **fctp);
 
+
 /* Set up NIP to run through the services.  If ALL is zero, use NIP's
    current location if it's not nil.  Return nonzero if there are no
    services (left).  */
@@ -76,7 +77,7 @@ free_memory (struct __netgrent *data)
     {
       struct name_list *tmp = data->known_groups;
       data->known_groups = data->known_groups->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 
@@ -84,7 +85,7 @@ free_memory (struct __netgrent *data)
     {
       struct name_list *tmp = data->needed_groups;
       data->needed_groups = data->needed_groups->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 }
@@ -113,7 +114,7 @@ __internal_setnetgrent_reuse (const char *group, struct __netgrent *datap)
     {
       if (new_elem != NULL)
 	free (new_elem);
-      status == NSS_STATUS_UNAVAIL;
+      status = NSS_STATUS_UNAVAIL;
     }
   else
     {
@@ -260,9 +261,9 @@ __internal_getnetgrent (char **hostp, char **userp, char **domainp,
 
   if (status == NSS_STATUS_SUCCESS)
     {
-      *hostp = datap->val.triple.host;
-      *userp = datap->val.triple.user;
-      *domainp = datap->val.triple.domain;
+      *hostp = (char *) datap->val.triple.host;
+      *userp = (char *) datap->val.triple.user;
+      *domainp = (char *) datap->val.triple.domain;
     }
 
   return status == NSS_STATUS_SUCCESS ? 1 : 0;
@@ -294,8 +295,8 @@ innetgr (const char *netgroup, const char *host, const char *user,
   int (*setfct) (const char *, struct __netgrent *);
   void (*endfct) (struct __netgrent *);
   int (*getfct) (struct __netgrent *, char *, size_t);
-  struct name_list *known;
-  struct name_list *needed;
+  struct name_list *known = NULL;
+  struct name_list *needed = NULL;
   int result = 0;
   int no_more;
   const char *current_group = netgroup;
@@ -407,14 +408,14 @@ innetgr (const char *netgroup, const char *host, const char *user,
     {
       struct name_list *tmp = known;
       known = known->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
   while (needed != NULL)
     {
       struct name_list *tmp = needed;
       needed = needed->next;
-      free (tmp->name);
+      free ((void *) tmp->name);
       free (tmp);
     }
 
diff --git a/inet/inet_net.c b/inet/inet_net.c
index cfaadd7949..1def607278 100644
--- a/inet/inet_net.c
+++ b/inet/inet_net.c
@@ -49,10 +49,9 @@ u_int32_t
 inet_network(cp)
 	register const char *cp;
 {
-	register u_int32_t val, base, n;
+	register u_int32_t val, base, n, i;
 	register char c;
 	u_int32_t parts[4], *pp = parts;
-	register int i;
 
 again:
 	val = 0; base = 10;
diff --git a/inet/netinet/tcp.h b/inet/netinet/tcp.h
index bc821e173e..bf12a0c609 100644
--- a/inet/netinet/tcp.h
+++ b/inet/netinet/tcp.h
@@ -43,11 +43,11 @@ struct tcphdr {
 	u_short	th_dport;		/* destination port */
 	tcp_seq	th_seq;			/* sequence number */
 	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 	u_char	th_x2:4,		/* (unused) */
 		th_off:4;		/* data offset */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if __BYTE_ORDER == __BIG_ENDIAN
 	u_char	th_off:4,		/* data offset */
 		th_x2:4;		/* (unused) */
 #endif
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 4a60f6bf67..bcfaacb8bf 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -59,7 +59,7 @@ Cambridge, MA 02139, USA.  */
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
+int _nl_msg_cat_cntr = 0;
 
 
 /* Load the message catalogs specified by FILENAME.  If it is no valid
diff --git a/io/utime.h b/io/utime.h
index 003e64778a..9f2f569b11 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -39,10 +39,10 @@ struct utimbuf
     __time_t modtime;		/* Modification time.  */
   };
 
-/* Set the access and modification times of FILE to those given in TIMES.
-   If TIMES is NULL, set them to the current time.  */
+/* Set the access and modification times of FILE to those given in
+   *FILE_TIMES.  If FILE_TIMES is NULL, set them to the current time.  */
 extern int utime __P ((__const char *__file,
-		       __const struct utimbuf *__times));
+		       __const struct utimbuf *__file_times));
 
 __END_DECLS
 
diff --git a/math/mathcalls.h b/math/mathcalls.h
index 13c33e8ebe..3a969122ae 100644
--- a/math/mathcalls.h
+++ b/math/mathcalls.h
@@ -88,10 +88,10 @@ __MATHCALL (atanh,, (_Mdouble_ __x));
 __MATHCALL (exp,, (_Mdouble_ __x));
 
 /* Break VALUE into a normalized fraction and an integral power of 2.  */
-__MATHCALL (frexp,, (_Mdouble_ __value, int *__exp));
+__MATHCALL (frexp,, (_Mdouble_ __x, int *__exponent));
 
 /* X times (two to the EXP power).  */
-__MATHCALL (ldexp,, (_Mdouble_ __x, int __exp));
+__MATHCALL (ldexp,, (_Mdouble_ __x, int __exponent));
 
 /* Natural logarithm of X.  */
 __MATHCALL (log,, (_Mdouble_ __x));
@@ -111,7 +111,7 @@ __MATHCALL (logb,, (_Mdouble_ __x));
 #endif
 
 /* Break VALUE into integral and fractional parts.  */
-__MATHCALL (modf,, (_Mdouble_ __value, _Mdouble_ *__iptr));
+__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr));
 
 
 /* Power functions.  */
diff --git a/nss/db-Makefile b/nss/db-Makefile
index 756f4c6ce6..983a36fb59 100644
--- a/nss/db-Makefile
+++ b/nss/db-Makefile
@@ -11,7 +11,8 @@ all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
 
 $(VAR_DB)/passwd.db: /etc/passwd
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
+	@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
 		 /^[^#]/ { printf ".%s ", $$1; print; \
 			   if (!uids[$$3]++) \
 			     { printf "=%s ", $$3; print } }' $^ | \
@@ -20,7 +21,8 @@ $(VAR_DB)/passwd.db: /etc/passwd
 
 $(VAR_DB)/group.db: /etc/group
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
+	@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
 		 /^[^#]/ { printf ".%s ", $$1; print; \
 			   printf "=%s ", $$3; print }' $^ | \
 	$(MAKEDB) -o $@ -
@@ -28,14 +30,18 @@ $(VAR_DB)/group.db: /etc/group
 
 $(VAR_DB)/ethers.db: /etc/ethers
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) '/^[^#]/ { printf ".%s ", $$1; print; \
+	@$(AWK) 'BEGIN { cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
+		 /^[^#]/ { printf ".%s ", $$1; print; \
 			   printf "=%s ", $$2; print }' $^ | \
 	$(MAKEDB) -o $@ -
 	@echo "done."
 
 $(VAR_DB)/protocols.db: /etc/protocols
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) '/^[^#]/ { printf ".%s ", $$1; print; \
+	@$(AWK) 'BEGIN { cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
+		 /^[^#]/ { printf ".%s ", $$1; print; \
 			   printf "=%s ", $$2; print; \
 			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
 			     { printf ".%s ", $$i; print } }' $^ | \
@@ -44,7 +50,9 @@ $(VAR_DB)/protocols.db: /etc/protocols
 
 $(VAR_DB)/rpc.db: /etc/rpc
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) '/^[^#]/ { printf ".%s ", $$1; print; \
+	@$(AWK) 'BEGIN { cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
+		 /^[^#]/ { printf ".%s ", $$1; print; \
 			   printf "=%s ", $$2; print; \
 			   for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
 			     { printf ".%s ", $$i; print } }' $^ | \
@@ -53,7 +61,8 @@ $(VAR_DB)/rpc.db: /etc/rpc
 
 $(VAR_DB)/services.db: /etc/services
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) 'BEGIN { FS="[ \t/]+" } \
+	@$(AWK) 'BEGIN { FS="[ \t/]+"; cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
 		 /^[^#]/ { printf ".%s/%s ", $$1, $$3; print; \
 			   printf "=%s/%s ", $$2, $$3; print; \
 			   for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
@@ -63,14 +72,17 @@ $(VAR_DB)/services.db: /etc/services
 
 $(VAR_DB)/shadow.db: /etc/shadow
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) 'BEGIN { FS=":"; OFS=":" } \
+	@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
 		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
 	$(MAKEDB) -o $@ -
 	@echo "done."
 
 $(VAR_DB)/netgroup.db: /etc/netgroup
 	@echo -n "$(patsubst %.db,%,$(@F))... "
-	@$(AWK) '/^[^#]/ { end=sub(/\\/, " "); \
+	@$(AWK) 'BEGIN { cnt=0 } \
+		 { printf "0%u ", cnt++; print } \
+		 /^[^#]/ { end=sub(/\\/, " "); \
 			   gsub(/[ \t]+/, " "); \
 			   if(end == 1) printf "%s", $$0; else print }' $^ | \
 	$(MAKEDB) -o $@ -
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index f12907c244..6ddfd61d8d 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -109,7 +109,8 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 	  if ((_res.options & RES_INIT) == 0 && res_init () == -1)
 	    {
 	      *h_errnop = NETDB_INTERNAL;
-	      return NULL;
+	      *result = NULL;
+	      return -1;
 	    }
 #endif /* need _res */
 	}
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 876ad10963..6c8105c03f 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -150,7 +150,7 @@ SETFUNC_NAME (STAYOPEN)
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
-      return NULL;
+      return;
     }
 #endif /* need _res */
 
@@ -188,7 +188,7 @@ ENDFUNC_NAME (void)
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
-      return NULL;
+      return;
     }
 #endif /* need _res */
 
@@ -225,7 +225,8 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
   if ((_res.options & RES_INIT) == 0 && res_init () == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
-      return NULL;
+      *result = NULL;
+      return -1;
     }
 #endif /* need _res */
 
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 2b0f292d66..341e9d4d68 100644
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -149,7 +149,7 @@ get_next_alias (const char *match, struct aliasent *result,
 	  /* If we are in IGNORE mode and the first character in the
 	     line is a white space we ignore the line and start
 	     reading the next.  */
-	  if (ignore && isspace (first_unused))
+	  if (ignore && isspace (*first_unused))
 	    continue;
 
 	  /* Terminate the line for any case.  */
@@ -179,7 +179,7 @@ get_next_alias (const char *match, struct aliasent *result,
 	     looking for.  If it does not match we simply ignore all
 	     lines until the next line containing the start of a new
 	     alias is found.  */
-	  ignore = match != NULL && strcmp (result->alias_name, match) == 0;
+	  ignore = match != NULL && strcmp (result->alias_name, match) != 0;
 
 	  while (! ignore)
 	    {
@@ -192,16 +192,11 @@ get_next_alias (const char *match, struct aliasent *result,
 
 	      if (first_unused != cp)
 		{
+		  /* OK, we can have a regular entry or an include
+		     request.  */
 		  if (*line != '\0')
-		    {
-		      /* OK, we can have a regular entry or an include
-			 request.  */
-		      *first_unused++ = '\0';
-		      ++line;
-		    }
-		  else
-		    ++first_unused;
-
+		    ++line;
+		  *first_unused++ = '\0';
 
 		  if (strncmp (cp, ":include:", 9) != 0)
 		    {
@@ -295,10 +290,8 @@ get_next_alias (const char *match, struct aliasent *result,
 		     just read character.  */
 		  int ch;
 
-		  first_unused[room_left - 1] = '\0';
-		  line = first_unused;
 		  ch = fgetc (stream);
-		  if (ch == EOF || !isspace (ch))
+		  if (ch == EOF || ch == '\n' || !isspace (ch))
 		    {
 		      size_t cnt;
 
@@ -329,6 +322,10 @@ get_next_alias (const char *match, struct aliasent *result,
 
 		  /* The just read character is a white space and so
 		     can be ignored.  */
+		  first_unused[room_left - 1] = '\0';
+		  line = fgets (first_unused, room_left, stream);
+		  if (first_unused[room_left - 1] != '\0')
+		    goto no_more_room;
 		  cp = strpbrk (line, "#\n");
 		  if (cp != NULL)
 		    *cp = '\0';
@@ -419,6 +416,8 @@ _nss_files_getaliasbyname_r (const char *name, struct aliasent *result,
       while (status == NSS_STATUS_RETURN);
     }
 
+  internal_endent ();
+
   __libc_lock_unlock (lock);
 
   return status;
diff --git a/posix/unistd.h b/posix/unistd.h
index 0e07d4e154..a9a89a73d3 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -72,7 +72,7 @@ __BEGIN_DECLS
 /* Encryption is present.  */
 #define	_XOPEN_CRYPT	1
 
-/* The enchanced internationalization capabilities according to XPG4.2
+/* The enhanced internationalization capabilities according to XPG4.2
    are present.  */
 #define	_XOPEN_ENH_I18N	1
 
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index b47d5edb8f..e1fff3dc3d 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -445,7 +445,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 
   /* If no other digit but a '0' is found the result is 0.0.
      Return current read pointer.  */
-  if ((c < L_('0') || c > L_('9')) && (wint_t) c != decimal)
+  if ((c < L_('0') || c > L_('9')) && (wint_t) c != decimal && !TOLOWER (c))
     {
       tp = correctly_grouped_prefix (start_of_digits, cp, thousands, grouping);
       /* If TP is at the start of the digits, there was no correctly
diff --git a/stdlib/tst-strtod.c b/stdlib/tst-strtod.c
index a38ff4a74b..792ed2e017 100644
--- a/stdlib/tst-strtod.c
+++ b/stdlib/tst-strtod.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,27 +24,28 @@ Cambridge, MA 02139, USA.  */
 
 struct ltest
   {
-    CONST char *str;		/* Convert this.  */
+    const char *str;		/* Convert this.  */
     double expect;		/* To get this.  */
     char left;			/* With this left over.  */
     int err;			/* And this in errno.  */
   };
-static CONST struct ltest tests[] =
+static const struct ltest tests[] =
   {
     { "12.345", 12.345, '\0', 0 },
     { "12.345e19", 12.345e19, '\0', 0 },
     { "-.1e+9", -.1e+9, '\0', 0 },
     { ".125", .125, '\0', 0 },
     { "1e20", 1e20, '\0', 0 },
+    { "0e-19", 0, '\0', 0 },
     { NULL, 0, '\0', 0 }
   };
 
-static void EXFUN(expand, (char *dst, int c));
+static void expand __P ((char *dst, int c));
 
 int
-DEFUN_VOID(main)
+main ()
 {
-  register CONST struct ltest *lt;
+  register const struct ltest *lt;
   char *ep;
   int status = 0;
 
@@ -82,7 +82,9 @@ DEFUN_VOID(main)
 }
 
 static void
-DEFUN(expand, (dst, c), register char *dst AND register int c)
+expand (dst, c)
+     char *dst;
+     register int c;
 {
   if (isprint(c))
     {
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
index 3cc9595dfb..022fa0379f 100644
--- a/sysdeps/alpha/Dist
+++ b/sysdeps/alpha/Dist
@@ -1,7 +1,7 @@
 setjmp_aux.c
 DEFS.h
 divrem.h
-divl.S divlu.S divq.S divqu.S reml.S remlu.S remq.S remqu.S
+divl.S divq.S reml.S remq.S
 _mcount.S
 stxcpy.S
 stxncpy.S
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 3e62c5f127..4f96864abc 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -605,17 +605,53 @@ TRANS Go home and have a glass of warm, dairy-fresh milk. */
 TRANS This error code has no purpose. */
     [EGRATUITOUS] = N_("Gratuitous error"),
 #endif
-#ifdef ERESTART
+#ifdef EBADMSG
 /* */
-    [ERESTART] = N_("Interrupted system call should be restarted"),
+    [EBADMSG] = N_("Bad message"),
+#endif
+#ifdef EIDRM
+/* */
+    [EIDRM] = N_("Identifier removed"),
+#endif
+#ifdef EMULTIHOP
+/* */
+    [EMULTIHOP] = N_("Multihop attempted"),
+#endif
+#ifdef ENODATA
+/* */
+    [ENODATA] = N_("No data available"),
+#endif
+#ifdef ENOLINK
+/* */
+    [ENOLINK] = N_("Link has been severed"),
 #endif
 #ifdef ENOMSG
 /* */
     [ENOMSG] = N_("No message of desired type"),
 #endif
-#ifdef EIDRM
+#ifdef ENOSR
 /* */
-    [EIDRM] = N_("Identifier removed"),
+    [ENOSR] = N_("Out of streams resources"),
+#endif
+#ifdef ENOSTR
+/* */
+    [ENOSTR] = N_("Device not a stream"),
+#endif
+#ifdef EOVERFLOW
+/* */
+    [EOVERFLOW] = N_("Value too large for defined data type"),
+#endif
+#ifdef EPROTO
+/* */
+    [EPROTO] = N_("Protocol error"),
+#endif
+#ifdef ETIME
+/* */
+    [ETIME] = N_("Timer expired"),
+#endif
+#ifdef ERESTART
+/* */
+    [ERESTART] = N_("Interrupted system call should be restarted"),
 #endif
 #ifdef ECHRNG
 /* */
@@ -681,22 +717,6 @@ TRANS This error code has no purpose. */
 /* */
     [EBFONT] = N_("Bad font file format"),
 #endif
-#ifdef ENOSTR
-/* */
-    [ENOSTR] = N_("Device not a stream"),
-#endif
-#ifdef ENODATA
-/* */
-    [ENODATA] = N_("No data available"),
-#endif
-#ifdef ETIME
-/* */
-    [ETIME] = N_("Timer expired"),
-#endif
-#ifdef ENOSR
-/* */
-    [ENOSR] = N_("Out of streams resources"),
-#endif
 #ifdef ENONET
 /* */
     [ENONET] = N_("Machine is not on the network"),
@@ -705,10 +725,6 @@ TRANS This error code has no purpose. */
 /* */
     [ENOPKG] = N_("Package not installed"),
 #endif
-#ifdef ENOLINK
-/* */
-    [ENOLINK] = N_("Link has been severed"),
-#endif
 #ifdef EADV
 /* */
     [EADV] = N_("Advertise error"),
@@ -721,26 +737,10 @@ TRANS This error code has no purpose. */
 /* */
     [ECOMM] = N_("Communication error on send"),
 #endif
-#ifdef EPROTO
-/* */
-    [EPROTO] = N_("Protocol error"),
-#endif
-#ifdef EMULTIHOP
-/* */
-    [EMULTIHOP] = N_("Multihop attempted"),
-#endif
 #ifdef EDOTDOT
 /* */
     [EDOTDOT] = N_("RFS specific error"),
 #endif
-#ifdef EBADMSG
-/* */
-    [EBADMSG] = N_("Not a data message"),
-#endif
-#ifdef EOVERFLOW
-/* */
-    [EOVERFLOW] = N_("Value too large for defined data type"),
-#endif
 #ifdef ENOTUNIQ
 /* */
     [ENOTUNIQ] = N_("Name not unique on network"),
diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c
index 116784eeab..7566fe6c6b 100644
--- a/sysdeps/posix/readv.c
+++ b/sysdeps/posix/readv.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,10 +43,10 @@ readv (fd, vector, count)
     bytes += vector[i].iov_len;
 
   /* Allocate a temporary buffer to hold the data.  */
-  buffer = (char *) __alloca(bytes);
+  buffer = (char *) __alloca (bytes);
 
   /* Read the data.  */
-  bytes_read = read(fd, buffer, bytes);
+  bytes_read = read (fd, buffer, bytes);
   if (bytes_read <= 0)
     return -1;
 
@@ -55,9 +55,9 @@ readv (fd, vector, count)
   for (i = 0; i < count; ++i)
     {
 #define	min(a, b)	((a) > (b) ? (b) : (a))
-      size_t copy = min(vector[i].iov_len, bytes);
+      size_t copy = min (vector[i].iov_len, bytes);
 
-      (void) memcpy((PTR) vector[i].iov_base, (PTR) buffer, copy);
+      (void) memcpy ((void *) vector[i].iov_base, (void *) buffer, copy);
 
       buffer += copy;
       bytes -= copy;
diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c
index 75a41d33b9..06306ad209 100644
--- a/sysdeps/posix/writev.c
+++ b/sysdeps/posix/writev.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,7 +43,7 @@ writev (fd, vector, count)
     bytes += vector[i].iov_len;
 
   /* Allocate a temporary buffer to hold the data.  */
-  buffer = (char *) __alloca(bytes);
+  buffer = (char *) __alloca (bytes);
 
   /* Copy the data into BUFFER.  */
   to_copy = bytes;
@@ -51,9 +51,9 @@ writev (fd, vector, count)
   for (i = 0; i < count; ++i)
     {
 #define	min(a, b)	((a) > (b) ? (b) : (a))
-      size_t copy = min(vector[i].iov_len, to_copy);
+      size_t copy = min (vector[i].iov_len, to_copy);
 
-      (void) memcpy((PTR) bp, (PTR) vector[i].iov_base, copy);
+      (void) memcpy ((void *) bp, (void *) vector[i].iov_base, copy);
 
       bp += copy;
       to_copy -= copy;
@@ -61,5 +61,5 @@ writev (fd, vector, count)
 	break;
     }
 
-  return write(fd, buffer, bytes);
+  return write (fd, buffer, bytes);
 }
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 0d0e031de1..86d1274a0c 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -24,7 +24,10 @@
 #include <sys/socket.h>
 #include <linux/in.h>
 
-/* Standard well-known ports.  */
+/* Standard well-known ports.  The use of these constants is
+   deprecated.  Instead use the contents of the file `/etc/services'
+   or similar databases by using the function getservbyname and
+   getservbyport.  */
 enum
   {
     IPPORT_ECHO = 7,		/* Echo service.  */
@@ -86,13 +89,13 @@ __BEGIN_DECLS
 
 /* Functions to convert between host and network byte order.  */
 
-extern unsigned long int ntohl __P ((unsigned long int));
-extern unsigned short int ntohs __P ((unsigned short int));
-extern unsigned long int htonl __P ((unsigned long int));
-extern unsigned short int htons __P ((unsigned short int));
+extern unsigned long int ntohl __P ((unsigned long int __long_word));
+extern unsigned short int ntohs __P ((unsigned short int __short_word));
+extern unsigned long int htonl __P ((unsigned long int __long_word));
+extern unsigned short int htons __P ((unsigned short int __short_word));
 
 /* Bind socket FD to a privileged IP address SIN.  */
-extern int bindresvport __P ((int __fd, struct sockaddr_in * __sin));
+extern int bindresvport __P ((int __fd, struct sockaddr_in * __sock_in));
 
 __END_DECLS
 
@@ -101,14 +104,14 @@ __END_DECLS
 #if __BYTE_ORDER == __BIG_ENDIAN
 /* The host byte order is the same as network byte order,
    so these functions are all just identity.  */
-#undef ntohl
-#define	ntohl(x)	(x)
-#undef ntohs
-#define	ntohs(x)	(x)
-#undef htonl
-#define	htonl(x)	(x)
-#undef htons
-#define	htons(x)	(x)
+# undef ntohl
+# define ntohl(x)	(x)
+# undef ntohs
+# define ntohs(x)	(x)
+# undef htonl
+# define htonl(x)	(x)
+# undef htons
+# define htons(x)	(x)
 #endif
 
 #endif	/* netinet/in.h */
diff --git a/time/Makefile b/time/Makefile
index e29a50b4d6..772461c778 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -125,7 +125,7 @@ $(installed-localtime-file): $(zonedir)/$(localtime) $(objpfx)zic
 	  echo Site timezone NOT reset to Factory.; \
 	else \
 	  rm -f $@T; \
-	  $(SHELL) $(common-objpfx)$(..)rellns-sh $< $@T; \
+	  $(SHELL) $(top_absdir)/rellns-sh $< $@T; \
 	  mv -f $@T $@; \
 	fi
 endif
diff --git a/version.h b/version.h
index 9008db2fe8..8cfae1376f 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "alpha"
-#define VERSION "1.97"
+#define VERSION "1.98"
author	Ulrich Drepper <drepper@redhat.com>	1996-11-17 03:15:52 +0000
committer	Ulrich Drepper <drepper@redhat.com>	1996-11-17 03:15:52 +0000
commit	afd4eb3759746286f7cccfbe27c45d52eb49b7b3 (patch)
tree	abc5229e708babe17c04a7ee83f38c2549a65164
parent	\indexbreaks, \realunder, \multitable, \footnotezzz. (diff)
download	glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.tar.gz glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.tar.bz2 glibc-afd4eb3759746286f7cccfbe27c45d52eb49b7b3.zip