Update.

	* intl/locale.alias: Change `japanese' alais to match X11R6's.
	Add `japanese.euc' alias.

	* manual/Makefile (%.info): Set LANGUAGE and LC_ALL explicitly to C
	before running makeinfo.

	* math/Makefile (libm-routines): $(strip) entire value.

	* nss/nss_db/db-XXX.c (internal_setent): Rewrite to avoid warning.

1998-10-24  H.J. Lu  <hjl@gnu.org>

	* libio/libio.h (_IO_cookie_io_functions_t): Protect with __USE_GNU.
	(_IO_cookie_file): Likewise.

1998-11-16  Philip Blundell  <philb@gnu.org>

	* inet/netinet/icmp6.h: Correct naming of constants.

1998-11-16  Ulrich Drepper  <drepper@cygnus.com>

	(fwrite_unlocked): Likewise.
	format, just stop.

7 files changed, 45 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ff484ea5c..f9866ffa37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 1998-11-16  Ulrich Drepper  <drepper@cygnus.com>
 
+	* intl/locale.alias: Change `japanese' alais to match X11R6's.
+	Add `japanese.euc' alias.
+
+	* manual/Makefile (%.info): Set LANGUAGE and LC_ALL explicitly to C
+	before running makeinfo.
+
+	* math/Makefile (libm-routines): $(strip) entire value.
+
+	* nss/nss_db/db-XXX.c (internal_setent): Rewrite to avoid warning.
+
+1998-10-24  H.J. Lu  <hjl@gnu.org>
+
+	* libio/libio.h (_IO_cookie_io_functions_t): Protect with __USE_GNU.
+	(_IO_cookie_file): Likewise.
+
+1998-11-16  Philip Blundell  <philb@gnu.org>
+
+	* inet/netinet/icmp6.h: Correct naming of constants.
+
+1998-11-16  Ulrich Drepper  <drepper@cygnus.com>
+
 	* sysdeps/unix/opendir.c: Use o_directory_works differently.  Treat
 	zero value as uninitialized so that variable can go into .bss.
 
@@ -25,7 +46,7 @@
 
 	* libio/bits/stdio.h (fread_unlocked): Don't evaluate non-constant
 	twice.  Don't bother handling zero size.
-	(frwite_unlocked): Likewise.
+	(fwrite_unlocked): Likewise.
 
 1998-11-15  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
@@ -59,7 +80,7 @@
 1998-11-13  Ulrich Drepper  <drepper@cygnus.com>
 
 	* stdio-common/vfscanf.c: Don't return -1 in case of an invalid
-	format, jsut stop.
+	format, just stop.
 
 	* version.h (VERSION): Bump to 2.0.102.
 
diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h
index 38c1bc19dd..5a38639539 100644
--- a/inet/netinet/icmp6.h
+++ b/inet/netinet/icmp6.h
@@ -24,12 +24,12 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define ICMPV6_FILTER 1
+#define ICMP6_FILTER 1
 
-#define ICMPV6_FILTER_BLOCK		1
-#define ICMPV6_FILTER_PASS		2
-#define ICMPV6_FILTER_BLOCKOTHERS	3
-#define ICMPV6_FILTER_PASSONLY		4
+#define ICMP6_FILTER_BLOCK		1
+#define ICMP6_FILTER_PASS		2
+#define ICMP6_FILTER_BLOCKOTHERS	3
+#define ICMP6_FILTER_PASSONLY		4
 
 struct icmp6_filter
   {
diff --git a/intl/locale.alias b/intl/locale.alias
index 175dd8cd31..b41ce4b0eb 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -40,7 +40,8 @@ hebrew          iw_IL.ISO-8859-8
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
 italian         it_IT.ISO-8859-1
-japanese	ja_JP.EUC
+japanese	ja_JP.SJIS
+japanese.euc	ja_JP.eucJP
 norwegian       no_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
 portuguese      pt_PT.ISO-8859-1
diff --git a/libio/libio.h b/libio/libio.h
index fcb8ae6eaa..011d44042e 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -255,6 +255,7 @@ extern _IO_FILE *_IO_stderr;
 #endif
 
 
+#ifdef _GNU_SOURCE
 /* Define the user-visible type, with user-friendly member names.  */
 typedef struct
 {
@@ -272,6 +273,7 @@ struct _IO_cookie_file
   void *cookie;
   _IO_cookie_io_functions_t io_functions;
 };
+#endif
 
 
 #ifdef __cplusplus
diff --git a/manual/Makefile b/manual/Makefile
index 0652d4dea0..0486dcad58 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -98,7 +98,7 @@ dir-add.info: xtract-typefun.awk $(texis)
 	mv -f $@.new $@
 
 %.info: %.texinfo
-	$(MAKEINFO) $<
+	LANGUAGE=C LC_ALL=C $(MAKEINFO) $<
 
 %.dvi: %.texinfo
 	$(TEXI2DVI) $<
diff --git a/math/Makefile b/math/Makefile
index 5bdbb066da..ffd7524205 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -57,9 +57,9 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod	\
 	     s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos	\
 	     s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
 	     s_fma s_lrint s_llrint s_lround s_llround e_exp10
-libm-routines = $(libm-support) $(libm-calls) \
-		$(patsubst %_rf,%f_r,$(libm-calls:=f))	\
-		$(long-m-$(long-double-fcts))
+libm-routines = $(strip $(libm-support) $(libm-calls) \
+			$(patsubst %_rf,%f_r,$(libm-calls:=f))	\
+			$(long-m-$(long-double-fcts)))
 long-m-routines = $(patsubst %_rl,%l_r,$(libm-calls:=l))
 long-m-yes = $(long-m-routines)
 distribute += $(long-m-yes:=.c)
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 8ba73efcb6..7356b34462 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -73,9 +73,9 @@ internal_setent (int stayopen)
 	}
       else
 	{
-	  /* We have to make sure the file is  `closed on exec'.  */
+	  /* We have to make sure the file is `closed on exec'.  */
 	  int fd;
-	  int result, flags;
+	  int result;
 
 	  err = db->fd (db, &fd);
 	  if (err != 0)
@@ -84,11 +84,14 @@ internal_setent (int stayopen)
 	      result = -1;
 	    }
 	  else
-	    result = flags = fcntl (fd, F_GETFD, 0);
-	  if (result >= 0)
 	    {
-	      flags |= FD_CLOEXEC;
-	      result = fcntl (fd, F_SETFD, flags);
+	      int flags = result = fcntl (fd, F_GETFD, 0);
+
+	      if (result >= 0)
+		{
+		  flags |= FD_CLOEXEC;
+		  result = fcntl (fd, F_SETFD, flags);
+		}
 	    }
 	  if (result < 0)
 	    {