diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 2001-01-31 06:36:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-31 06:36:39 +0000 |
| commit | 7e118246da012348761ecbfb88bc2ac3d985cbc0 (patch) | |
| tree | b68e6059b87b9cf034861d9ceef900d3f3135065 /string | |
| parent | Update. (diff) | |
| download | glibc-7e118246da012348761ecbfb88bc2ac3d985cbc0.tar.gz glibc-7e118246da012348761ecbfb88bc2ac3d985cbc0.tar.bz2 glibc-7e118246da012348761ecbfb88bc2ac3d985cbc0.zip | |
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>.
Diffstat (limited to 'string')
| -rw-r--r-- | string/bits/string2.h | 16 |
1 files changed, 8 insertions, 8 deletions
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 |