update from main archive 970125 cvs/libc-970126

Sun Jan 26 05:41:42 1997  Ulrich Drepper  <drepper@cygnus.com>

	* version.h (VERSION): Bump to 2.0.
	(RELEASE): Now it's "experimental".

	* Makefile (subdirs): Change $(malloc) to malloc.  We have only
	one malloc implementation again.
	* malloc/*: Remove from GNU libc.
	* new-malloc/* Move to malloc/.
	* config.make.in (defines): Remove @USE_NEW_MALLOC@.
	* configure.in: Remove --enable-new-malloc option and check for
	malloc implementation choice.
	* malloc.h: We don't need to check for the implementation to use
	anymore.  Simply include malloc/malloc.h.
	* malloc/Makefile (subdir): Change to malloc.
	* sysdeps/unix/sysv/linux/configure.in: Don't set malloc anymore.

	* Makefile: Add special goal to call generate only-MD5 based crypt
	library.
	* md5-crypt/Makefile: Likewise.

	* stdio-common/tstscanf.c: De-ANSI-declfy.  Update copyright.
	(rounds): Change type to size_t to prevent warning.

	* wcsmbs/btowc.c: Reformat copyright.
	* wcsmbs/mbrlen.c: Likewise.
	* wcsmbs/mbsinit.c: Likewise.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcpcpy.c: Likewise.
	* wcsmbs/wcpncpy.c: Likewise.
	* wcsmbs/wcscat.c: Likewise.
	* wcsmbs/wcscmp.c: Likewise.
	* wcsmbs/wcscoll.c: Likewise.
	* wcsmbs/wcscpy.c: Likewise.
	* wcsmbs/wcscspn.c: Likewise.
	* wcsmbs/wcsdup.c: Likewise.
	* wcsmbs/wcslen.c: Likewise.
	* wcsmbs/wcsncat.c: Likewise.
	* wcsmbs/wcsncpy.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/wcsspn.c: Likewise.
	* wcsmbs/wcsstr.c: Likewise.
	* wcsmbs/wcstod.c: Likewise.
	* wcsmbs/wcstof.c: Likewise.
	* wcsmbs/wcstok.c: Likewise.
	* wcsmbs/wcstol.c: Likewise.
	* wcsmbs/wcstold.c: Likewise.
	* wcsmbs/wcstoq.c: Likewise.
	* wcsmbs/wcstoul.c: Likewise.
	* wcsmbs/wcstouq.c: Likewise.
	* wcsmbs/wcswidth.c: Likewise.
	* wcsmbs/wcsxfrm.c: Likewise.
	* wcsmbs/wctob.c: Likewise.
	* wcsmbs/wcwidth.c: Likewise.
	* wcsmbs/wcwidth.h: Likewise.
	* wcsmbs/wmemchr.c: Likewise.
	* wcsmbs/wmemcmp.c: Likewise.
	* wcsmbs/wmemmove.c: Likewise.
	* wcsmbs/wmemset.c: Likewise.

Sat Jan 25 03:34:14 1997  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/termbits.h: Protect against multiple
	inclusion.  Reported by a sun <asun@zoology.washington.edu>.

	Likewise for scanf4.c
	* stdlib/stdlib.h: Declare reentrant function from rand48 family

1 files changed, 18 insertions, 18 deletions

diff --git a/wcsmbs/wcscat.c b/wcsmbs/wcscat.c
index e142806fae..c63442a546 100644
--- a/wcsmbs/wcscat.c
+++ b/wcsmbs/wcscat.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
-
-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, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   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 <wchar.h>