Update.

2001-01-29  Ben Collins  <bcollins@debian.org>

	* sysdeps/sparc/fpu/fraiseexcpt.c: Include <float.h>.
	* sysdeps/hppa/fpu/fraiseexcpt.c: Likewise.
	* sysdeps/m68k/fpu/fraiseexcpt.c: Likewise.
	* sysdeps/s390/fpu/fraiseexcpt.c: Likewise.

	* locale/programs/ld-measurement.c (measurement_finish): Fix a typo.
	Patch by Marko Myllynen <myllynen@lut.fi>.

	* string/bits/string2.h (__strpbrk_c2): Correct parameter types
	(int instead of char).
	(__strpbrk_c3): Likewise.
	Reported by GOTO Masanori <gotom@debian.or.jp>.

	Reported by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>.

9 files changed, 29 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 0148a8614e..c35687e09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,24 @@
+2001-01-29  Ben Collins  <bcollins@debian.org>
+
+	* sysdeps/sparc/fpu/fraiseexcpt.c: Include <float.h>.
+	* sysdeps/hppa/fpu/fraiseexcpt.c: Likewise.
+	* sysdeps/m68k/fpu/fraiseexcpt.c: Likewise.
+	* sysdeps/s390/fpu/fraiseexcpt.c: Likewise.
+
 2001-01-30  Ulrich Drepper  <drepper@redhat.com>
 
+	* locale/programs/ld-measurement.c (measurement_finish): Fix a typo.
+	Patch by Marko Myllynen <myllynen@lut.fi>.
+
+	* string/bits/string2.h (__strpbrk_c2): Correct parameter types
+	(int instead of char).
+	(__strpbrk_c3): Likewise.
+	Reported by GOTO Masanori <gotom@debian.or.jp>.
+
 	* sysdeps/generic/bits/sockaddr.h: Remove SA_LEN macro.
 	* sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Likewise.
 	* include/sys/socket.h: Add SA_LEN here for internal use.
+	Reported by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>.
 
 2001-01-29  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c
index e0ee592a3f..f628026473 100644
--- a/locale/programs/ld-measurement.c
+++ b/locale/programs/ld-measurement.c
@@ -110,7 +110,7 @@ measurement_finish (struct localedef_t *locale, struct charmap_t *charmap)
     {
       if (measurement->measurement > 3)
 	error (0, 0, _("%s: invalid value for field `%s'"),
-	       "LC_MEASUREMENT", "meassurement");
+	       "LC_MEASUREMENT", "measurement");
     }
 }
 
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 335eef8a1e..150ad561c5 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -2195,9 +2195,7 @@ noexpr   "<U005E><U005B><U004E><U006E><U0045><U0065><U005D><U002E><U002A>"
 END LC_MESSAGES
 
 LC_PAPER
-% FIXME
 height   297
-% FIXME
 width    210
 END LC_PAPER
 
@@ -2208,7 +2206,6 @@ int_prefix     "<U0033><U0035><U0038>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
index afd4f0f100..db6824b97e 100644
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@@ -108,9 +108,7 @@ date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_PAPER
-% FIXME
 height   297
-% FIXME
 width    210
 END LC_PAPER
 
@@ -121,7 +119,6 @@ int_prefix     "<U0033><U0035><U0038>"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-% FIXME
 measurement    1
 END LC_MEASUREMENT
 
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 32a1746ae8..a009264faa 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1,5 +1,5 @@
 /* Machine-independant string function optimizations.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -980,10 +980,10 @@ __strspn_c3 (__const char *__s, char __accept1, char __accept2, char __accept3)
 		  : strpbrk (s, accept)))))				      \
       : strpbrk (s, accept)); })
 
-__STRING_INLINE char *__strpbrk_c2 (__const char *__s, char __accept1,
-				     char __accept2);
+__STRING_INLINE char *__strpbrk_c2 (__const char *__s, int __accept1,
+				     int __accept2);
 __STRING_INLINE char *
-__strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
+__strpbrk_c2 (__const char *__s, int __accept1, int __accept2)
 {
   /* Please note that __accept1 and __accept2 never can be '\0'.  */
   while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
@@ -991,11 +991,11 @@ __strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
   return *__s == '\0' ? NULL : (char *) (size_t) __s;
 }
 
-__STRING_INLINE char *__strpbrk_c3 (__const char *__s, char __accept1,
-				     char __accept2, char __accept3);
+__STRING_INLINE char *__strpbrk_c3 (__const char *__s, int __accept1,
+				     int __accept2, int __accept3);
 __STRING_INLINE char *
-__strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
-	      char __accept3)
+__strpbrk_c3 (__const char *__s, int __accept1, int __accept2,
+	      int __accept3)
 {
   /* Please note that __accept1 to __accept3 never can be '\0'.  */
   while (*__s != '\0' && *__s != __accept1 && *__s != __accept2
diff --git a/sysdeps/hppa/fpu/fraiseexcpt.c b/sysdeps/hppa/fpu/fraiseexcpt.c
index 7feeb9946f..c0cce6e7ce 100644
--- a/sysdeps/hppa/fpu/fraiseexcpt.c
+++ b/sysdeps/hppa/fpu/fraiseexcpt.c
@@ -19,6 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <fenv.h>
+#include <float.h>
 #include <math.h>
 
 int
diff --git a/sysdeps/m68k/fpu/fraiseexcpt.c b/sysdeps/m68k/fpu/fraiseexcpt.c
index dcdd6c9131..1c559c2b26 100644
--- a/sysdeps/m68k/fpu/fraiseexcpt.c
+++ b/sysdeps/m68k/fpu/fraiseexcpt.c
@@ -19,6 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <fenv.h>
+#include <float.h>
 #include <math.h>
 
 int
diff --git a/sysdeps/s390/fpu/fraiseexcpt.c b/sysdeps/s390/fpu/fraiseexcpt.c
index e6c716cfc6..8047eb4c22 100644
--- a/sysdeps/s390/fpu/fraiseexcpt.c
+++ b/sysdeps/s390/fpu/fraiseexcpt.c
@@ -20,6 +20,7 @@
    Boston, MA 02111-1307, USA. */
 
 #include <fenv_libc.h>
+#include <float.h>
 #include <math.h>
 
 
diff --git a/sysdeps/sparc/fpu/fraiseexcpt.c b/sysdeps/sparc/fpu/fraiseexcpt.c
index b6c5d80541..ce6092499b 100644
--- a/sysdeps/sparc/fpu/fraiseexcpt.c
+++ b/sysdeps/sparc/fpu/fraiseexcpt.c
@@ -18,6 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <fenv.h>
+#include <float.h>
 #include <math.h>
 #include <shlib-compat.h>