update from main archive 961220cvs/libc-961229cvs/libc-961228cvs/libc-961227cvs/libc-961226cvs/libc-961225cvs/libc-961224cvs/libc-961223cvs/libc-961222

Sun Dec 22 00:01:27 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/getnetgrent.c: Reformat copyright.

	* inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment.
	(__internal_getnetgrent): Rename to __internal_getnetgrent_r as
	required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996.
	Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.

	* nss/nss_files/files-netgrp.c: Fix typo.
	* login/utmp_db.c: Comment out unused variables.
	* misc/tst-dirname.c: Provide prototype for main (for now).
	* new-malloc/mcheck-init.c: Include <mcheck.h>.
	* new-malloc/obstack.c: Provide real prototypes.

	* resolv/base64.c (b64_ntop): Use size_t as type of `i', not int.
	(b64_pton): Likewise for `tarindex'.
	* resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning.

	* stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning.
	* stdio-common/printf-parse.h: Remove definition of MIN and MAX.
	* stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX.
	* stdio-common/vfprintf.c: Likewise.
	* stdlib/gmp-impl.h: Only define MIN and MAX if not already done.
	* stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value.

	* sysdeps/generic/Makefile ($(subdir)=string): Define
	CFLAGS-wordcopy.c to prevent warning.
	* sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline.
	* sysdeps/generic/wordcopy.c: De-ANSI-declfy.
	* sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
	to prevent warning.
	* sysdeps/i386/dl-machine.h: Correct copyright.
	* sysdeps/unix/closedir.c: Likewise.
	* sysdeps/unix/dirstream.h: Likewise.
	* sysdeps/unix/opendir.c: Likewise.
	* time/tzset.c: Add prototype for __tzset_internal.

	* sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the
	way it is supposed to work is not yet known.
	(struct utmp): Remove ut_login and ut_syslen field for now.

Sat Dec 21 16:23:54 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/strftime.c: Fix another bug in handling flags made it
	impossible to use the `-', `_', or `0' flag.

27 files changed, 246 insertions, 141 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d3fe31fc8..06aa40388f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+Sun Dec 22 00:01:27 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* inet/getnetgrent.c: Reformat copyright.
+
+	* inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment.
+	(__internal_getnetgrent): Rename to __internal_getnetgrent_r as
+	required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996.
+	Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
+
+	* nss/nss_files/files-netgrp.c: Fix typo.
+	* login/utmp_db.c: Comment out unused variables.
+	* misc/tst-dirname.c: Provide prototype for main (for now).
+	* new-malloc/mcheck-init.c: Include <mcheck.h>.
+	* new-malloc/obstack.c: Provide real prototypes.
+
+	* resolv/base64.c (b64_ntop): Use size_t as type of `i', not int.
+	(b64_pton): Likewise for `tarindex'.
+	* resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning.
+
+	* stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning.
+	* stdio-common/printf-parse.h: Remove definition of MIN and MAX.
+	* stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX.
+	* stdio-common/vfprintf.c: Likewise.
+	* stdlib/gmp-impl.h: Only define MIN and MAX if not already done.
+	* stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value.
+
+	* sysdeps/generic/Makefile ($(subdir)=string): Define
+	CFLAGS-wordcopy.c to prevent warning.
+	* sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline.
+	* sysdeps/generic/wordcopy.c: De-ANSI-declfy.
+	* sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
+	to prevent warning.
+	* sysdeps/i386/dl-machine.h: Correct copyright.
+	* sysdeps/unix/closedir.c: Likewise.
+	* sysdeps/unix/dirstream.h: Likewise.
+	* sysdeps/unix/opendir.c: Likewise.
+	* time/tzset.c: Add prototype for __tzset_internal.
+
+	* sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the
+	way it is supposed to work is not yet known.
+	(struct utmp): Remove ut_login and ut_syslen field for now.
+
+Sat Dec 21 16:23:54 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* time/strftime.c: Fix another bug in handling flags made it
+	impossible to use the `-', `_', or `0' flag.
+
 Sat Dec 21 04:14:16 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/common/pause.c: Add missing second argument in
diff --git a/inet/getnetgrent.c b/inet/getnetgrent.c
index 3510f015d3..c310e0128e 100644
--- a/inet/getnetgrent.c
+++ b/inet/getnetgrent.c
@@ -1,20 +1,20 @@
 /* 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 <netdb.h>
 
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index ffa45193a9..1ef043a326 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -159,7 +159,7 @@ __internal_endnetgrent (struct __netgrent *datap)
   /* Remember which was the last used service.  */
   old_nip = nip;
 
-  /* Cycle through all the services and run their setnetgrent functions.  */
+  /* Cycle through all the services and run their endnetgrent functions.  */
   no_more = setup ((void **) &fct, "endnetgrent", 1);
   while (! no_more)
     {
@@ -187,9 +187,9 @@ endnetgrent (void)
 
 
 int
-__internal_getnetgrent (char **hostp, char **userp, char **domainp,
-			struct __netgrent *datap,
-			char *buffer, size_t buflen)
+__internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
+			  struct __netgrent *datap,
+			  char *buffer, size_t buflen)
 {
   enum nss_status (*fct) (struct __netgrent *, char *, size_t);
   int no_more;
@@ -278,8 +278,8 @@ __getnetgrent_r (char **hostp, char **userp, char **domainp,
 
   __libc_lock_lock (lock);
 
-  status = __internal_getnetgrent (hostp, userp, domainp, &dataset,
-				   buffer, buflen);
+  status = __internal_getnetgrent_r (hostp, userp, domainp, &dataset,
+				     buffer, buflen);
 
   __libc_lock_unlock (lock);
 
diff --git a/login/utmp_db.c b/login/utmp_db.c
index 2c5baf6592..70ed161f59 100644
--- a/login/utmp_db.c
+++ b/login/utmp_db.c
@@ -37,9 +37,11 @@ static const char default_file_name[] = _PATH_UTMP_DB;
 static const char *file_name = (const char *) default_file_name;
 
 /* Descriptor for database.  */
+#if 0
+/* XXX One day this will become menaingful again.  */
 static DB *db_fd;
 static char last_date[16];
-
+#endif
 
 /* Our local functions.  */
 static int setutent_db (int reset);
diff --git a/malloc/mcheck-init.c b/malloc/mcheck-init.c
index a1cb7c9e39..aa1051f48f 100644
--- a/malloc/mcheck-init.c
+++ b/malloc/mcheck-init.c
@@ -1,25 +1,26 @@
-/* Copyright (C) 1991, 1994, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1994, 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.  */
 
 /* The object of this file should be installed as libmcheck.a,
    so one can do -lmcheck to turn on mcheck.  */
 
 #include <malloc.h>
+#include <mcheck.h>
 
 static void
 turn_on_mcheck __P ((void))
diff --git a/malloc/obstack.c b/malloc/obstack.c
index e059b5a7d0..1e36c4a0a5 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -104,6 +104,20 @@ struct obstack *_obstack;
    For free, do not use ?:, since some compilers, like the MIPS compilers,
    do not allow (expr) ? void : void.  */
 
+#if defined (__STDC__) && __STDC__
+#define CALL_CHUNKFUN(h, size) \
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
+
+#define CALL_FREEFUN(h, old_chunk) \
+  do { \
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
+  } while (0)
+#else
 #define CALL_CHUNKFUN(h, size) \
   (((h) -> use_extra_arg) \
    ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
@@ -116,6 +130,7 @@ struct obstack *_obstack;
     else \
       (*(void (*) ()) (h)->freefun) ((old_chunk)); \
   } while (0)
+#endif
 
 
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
@@ -132,8 +147,13 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
      struct obstack *h;
      int size;
      int alignment;
+#if defined (__STDC__) && __STDC__
+     POINTER (*chunkfun) (long);
+     void (*freefun) (void *);
+#else
      POINTER (*chunkfun) ();
      void (*freefun) ();
+#endif
 {
   register struct _obstack_chunk *chunk; /* points to new chunk */
 
@@ -156,8 +176,13 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
       size = 4096 - extra;
     }
 
+#if defined (__STDC__) && __STDC__
+  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+#else
   h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
   h->freefun = freefun;
+#endif
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
@@ -180,8 +205,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
      struct obstack *h;
      int size;
      int alignment;
+#if defined (__STDC__) && __STDC__
+     POINTER (*chunkfun) (POINTER, long);
+     void (*freefun) (POINTER, POINTER);
+#else
      POINTER (*chunkfun) ();
      void (*freefun) ();
+#endif
      POINTER arg;
 {
   register struct _obstack_chunk *chunk; /* points to new chunk */
@@ -205,8 +235,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
       size = 4096 - extra;
     }
 
+#if defined(__STDC__) && __STDC__
+  h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+#else
   h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
   h->freefun = freefun;
+#endif
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->extra_arg = arg;
diff --git a/misc/tst-dirname.c b/misc/tst-dirname.c
index 472c290789..3fa38bdfe7 100644
--- a/misc/tst-dirname.c
+++ b/misc/tst-dirname.c
@@ -42,6 +42,7 @@ test (input, result)
   return retval;
 }
 
+int main __P ((int argc, char *argv[]));
 int
 main (argc, argv)
      int argc;
diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c
index 7fd6b3f7cb..d9dbf94a19 100644
--- a/nss/nss_files/files-netgrp.c
+++ b/nss/nss_files/files-netgrp.c
@@ -105,7 +105,7 @@ _nss_files_setnetgrent (const char *group, struct __netgrent *result)
 		/* Remove these characters from the stored line.  */
 		result->cursor -= 2;
 
-	      /* Get netxt line.  */
+	      /* Get next line.  */
 	      curlen = getline (&line, &line_len, fp);
 	      if (curlen <= 0)
 		break;
diff --git a/resolv/base64.c b/resolv/base64.c
index 31cd18188f..5d9eb6ec3d 100644
--- a/resolv/base64.c
+++ b/resolv/base64.c
@@ -137,7 +137,7 @@ b64_ntop(src, srclength, target, targsize)
 	size_t datalength = 0;
 	u_char input[3];
 	u_char output[4];
-	int i;
+	size_t i;
 
 	while (2 < srclength) {
 		input[0] = *src++;
@@ -204,7 +204,8 @@ b64_pton(src, target, targsize)
 	u_char *target;
 	size_t targsize;
 {
-	int tarindex, state, ch;
+	size_t tarindex;
+	int state, ch;
 	char *pos;
 
 	state = 0;
diff --git a/resolv/nsap_addr.c b/resolv/nsap_addr.c
index 2f8ffae322..5f41a736d6 100644
--- a/resolv/nsap_addr.c
+++ b/resolv/nsap_addr.c
@@ -54,7 +54,7 @@ inet_nsap_addr(ascii, binary, maxlen)
 	register u_char c, nib;
 	u_int len = 0;
 
-	while ((c = *ascii++) != '\0' && len < maxlen) {
+	while ((c = *ascii++) != '\0' && (int) len < maxlen) {
 		if (c == '.' || c == '+' || c == '/')
 			continue;
 		if (!isascii(c))
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index ec7429c36e..5189dd7eef 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -48,6 +48,7 @@ tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \
 
 include ../Rules
 
+CFLAGS-vfprintf.c = -Wno-uninitialized
 CFLAGS-_itoa.c = -Wno-unused
 CFLAGS-tst-printf.c = -Wno-format
 CFLAGS-tstdiomisc.c = -Wno-format
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 8e3ea0af88..141164b04b 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -25,14 +25,6 @@
 #define NDEBUG 1
 #include <assert.h>
 
-#ifndef MAX
-#define MAX(a,b)	({typeof(a) _a = (a); typeof(b) _b = (b);	      \
-			  _a > _b ? _a : _b; })
-#endif
-#ifndef MIN
-#define MIN(a,b)	({typeof(a) _a = (a); typeof(b) _b = (b);	      \
-			  _a < _b ? _a : _b; })
-#endif
 
 struct printf_spec
   {
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index a15be55c48..4f15373544 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,26 +1,27 @@
 /* Copyright (C) 1991, 1992, 1995, 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 <stdio.h>
 #include <printf.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <sys/param.h>
 
 #ifndef COMPILE_WPRINTF
 # define CHAR_T		char
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index e2763e4c7d..d24c917bc2 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <wchar.h>
 #include <libc-lock.h>
+#include <sys/param.h>
 #include "_itoa.h"
 #include "../locale/localeinfo.h"
 
diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h
index 62e96da952..837fcfdb28 100644
--- a/stdlib/gmp-impl.h
+++ b/stdlib/gmp-impl.h
@@ -66,8 +66,12 @@ MA 02111-1307, USA. */
 #endif
 
 #define ABS(x) (x >= 0 ? x : -x)
+#ifndef MIN
 #define MIN(l,o) ((l) < (o) ? (l) : (o))
+#endif
+#ifndef MAX
 #define MAX(h,i) ((h) > (i) ? (h) : (i))
+#endif
 
 /* Field access macros.  */
 #define SIZ(x) ((x)->_mp_size)
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index 1566364b32..58878f236e 100644
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -25,8 +25,8 @@ static const struct ltest tests[] =
     { "2147483648",	2147483647,	0,	0,	ERANGE },
     { "214748364888",	2147483647,	0,	0,	ERANGE },
     { "2147483650",	2147483647,	0,	0,	ERANGE },
-    { "-2147483649",	-2147483648,	0,	0,	ERANGE },
-    { "-2147483648",	-2147483648,	0,	0,	0 },
+    { "-2147483649",	0x80000000,	0,	0,	ERANGE },
+    { "-2147483648",	0x80000000,	0,	0,	0 },
     { "0123",		0123,		0,	0,	0 },
     { "0x1122334455z",	2147483647,	16,	'z',	ERANGE },
     { "0x0xc",		0,		0,	'x',	0 },
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index 5e0f03abcc..f4d001b7f4 100644
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -12,9 +12,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.
 
 ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bytesex.h))))))
@@ -51,3 +51,7 @@ generated := $(generated) make_siglist siglist.c
 endif
 endif
 endif
+
+ifeq ($(subdir),string)
+CFLAGS-wordcopy.c += -Wno-uninitialized
+endif
diff --git a/sysdeps/generic/mul_n.c b/sysdeps/generic/mul_n.c
index b38e8ad17e..a1e7f46a97 100644
--- a/sysdeps/generic/mul_n.c
+++ b/sysdeps/generic/mul_n.c
@@ -358,7 +358,7 @@ impn_sqr_n (prodp, up, size, tspace)
 }
 
 /* This should be made into an inline function in gmp.h.  */
-inline void
+void
 #if __STDC__
 mpn_mul_n (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)
 #else
diff --git a/sysdeps/generic/wordcopy.c b/sysdeps/generic/wordcopy.c
index 44dabf6e00..79f45db32d 100644
--- a/sysdeps/generic/wordcopy.c
+++ b/sysdeps/generic/wordcopy.c
@@ -1,25 +1,24 @@
 /* _memcopy.c -- subroutines for memory copy functions.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1996 Free Software Foundation, Inc.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
-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.  */
 
 /* BE VERY CAREFUL IF YOU CHANGE THIS CODE...!  */
 
-#include <ansidecl.h>
 #include <stddef.h>
 #include <memcopy.h>
 
@@ -28,8 +27,10 @@ Cambridge, MA 02139, USA.  */
    Both SRCP and DSTP should be aligned for memory operations on `op_t's.  */
 
 void
-DEFUN(_wordcopy_fwd_aligned, (dstp, srcp, len),
-      long int dstp AND long int srcp AND size_t len)
+_wordcopy_fwd_aligned (dstp, srcp, len)
+     long int dstp;
+     long int srcp;
+     size_t len;
 {
   op_t a0, a1;
 
@@ -71,7 +72,7 @@ DEFUN(_wordcopy_fwd_aligned, (dstp, srcp, len),
       dstp -= 2 * OPSIZ;
       len += 1;
       goto do6;
-      
+
     case 0:
       if (OP_T_THRES <= 3 * OPSIZ && len == 0)
 	return;
@@ -134,8 +135,10 @@ DEFUN(_wordcopy_fwd_aligned, (dstp, srcp, len),
    *not* be aligned.  */
 
 void
-DEFUN(_wordcopy_fwd_dest_aligned, (dstp, srcp, len),
-      long int dstp AND long int srcp AND size_t len)
+_wordcopy_fwd_dest_aligned (dstp, srcp, len)
+     long int dstp;
+     long int srcp;
+     size_t len;
 {
   op_t a0, a1, a2, a3;
   int sh_1, sh_2;
@@ -219,8 +222,10 @@ DEFUN(_wordcopy_fwd_dest_aligned, (dstp, srcp, len),
    operations on `op_t's.  */
 
 void
-DEFUN(_wordcopy_bwd_aligned, (dstp, srcp, len),
-      long int dstp AND long int srcp AND size_t len)
+_wordcopy_bwd_aligned (dstp, srcp, len)
+     long int dstp;
+     long int srcp;
+     size_t len;
 {
   op_t a0, a1;
 
@@ -262,7 +267,7 @@ DEFUN(_wordcopy_bwd_aligned, (dstp, srcp, len),
       a1 = ((op_t *) srcp)[6];
       len += 1;
       goto do6;
-      
+
     case 0:
       if (OP_T_THRES <= 3 * OPSIZ && len == 0)
 	return;
@@ -325,8 +330,10 @@ DEFUN(_wordcopy_bwd_aligned, (dstp, srcp, len),
    operations on `op_t', but SRCP must *not* be aligned.  */
 
 void
-DEFUN(_wordcopy_bwd_dest_aligned, (dstp, srcp, len),
-      long int dstp AND long int srcp AND size_t len)
+_wordcopy_bwd_dest_aligned (dstp, srcp, len)
+     long int dstp;
+     long int srcp;
+     size_t len;
 {
   op_t a0, a1, a2, a3;
   int sh_1, sh_2;
diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h
index 4ba3a19960..9fcc77de6b 100644
--- a/sysdeps/gnu/utmpbits.h
+++ b/sysdeps/gnu/utmpbits.h
@@ -53,6 +53,10 @@ struct lastlog
 };
 
 
+/* XXX We are not ready to use this now.  It needs some more research.
+   Simly copying the behaviour of other implementations is no big
+   help.  */
+#if 0
 /* Which program created the record.  */
 enum utlogin
 {
@@ -68,6 +72,7 @@ enum utlogin
   xterm
   /* More could be added here.  */
 };
+#endif
 
 
 struct exit_status
@@ -91,9 +96,7 @@ struct utmp
   long ut_session;		/* Session ID, used for windowing.  */
   struct timeval ut_tv;		/* Time entry was made.  */
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  enum utlogin ut_login;	/* To store information about source.  */
-  short int ut_syslen;		/* Significant length of ut_host.  */
-  char pad[14];			/* Reserved for future use.  */
+  char pad[18];			/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index e1e098788d..e1dcd52052 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -4,3 +4,7 @@ asm-CPPFLAGS := $(asm-CPPFLAGS) -DGAS_SYNTAX
 
 # The i386 `long double' is a distinct type we support.
 long-double-fcts = yes
+
+ifeq ($(subdir),elf)
+CFLAGS-rtld.c += -Wno-uninitialized
+endif
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index e1b0f4780f..dd820fd8c4 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -13,9 +13,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.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.  */
 
 #ifndef dl_machine_h
 #define dl_machine_h
diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c
index a46d47ac35..a3903185a5 100644
--- a/sysdeps/unix/closedir.c
+++ b/sysdeps/unix/closedir.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1993, 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.  */
+   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 <errno.h>
 #include <stddef.h>
diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h
index feeb74e7d9..cbbdb6b659 100644
--- a/sysdeps/unix/dirstream.h
+++ b/sysdeps/unix/dirstream.h
@@ -1,20 +1,20 @@
 /* Copyright (C) 1993, 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.  */
+   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.  */
 
 #ifndef	_DIRSTREAM_H
 
diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c
index 6a9c7aca86..b4e691a3af 100644
--- a/sysdeps/unix/opendir.c
+++ b/sysdeps/unix/opendir.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 92, 93, 94, 95, 96 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 <errno.h>
 #include <limits.h>
diff --git a/time/strftime.c b/time/strftime.c
index 4afcdd20fb..56abd45240 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -493,6 +493,7 @@ strftime (s, maxsize, format, tp)
 #endif /* ! DO_MULTIBYTE */
 
       /* Check for flags that can modify a format.  */
+      pad = 0;
       while (1)
 	{
 	  switch (*++f)
@@ -510,7 +511,6 @@ strftime (s, maxsize, format, tp)
 	      continue;
 
 	    default:
-	      pad = 0;
 	      break;
 	    }
 	  break;
diff --git a/time/tzset.c b/time/tzset.c
index 085dfcaa33..886ac6c0c8 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -77,6 +77,7 @@ static int compute_change __P ((tz_rule *rule, int year));
 static char *old_tz = NULL;
 
 /* Interpret the TZ envariable.  */
+void __tzset_internal __P ((void));
 void
 __tzset_internal ()
 {