diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-10-07 20:26:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-10-07 20:26:31 +0000 |
| commit | b61345a1add0789a12fe341563374d64b5134771 (patch) | |
| tree | 556bf360e30dc81c42fc439ffc08776fcf424afa /string | |
| parent | c47e78b10f6b18532951fb6f6b0c5a2e8afcf88e (diff) | |
| download | glibc-b61345a1add0789a12fe341563374d64b5134771.zip glibc-b61345a1add0789a12fe341563374d64b5134771.tar.gz glibc-b61345a1add0789a12fe341563374d64b5134771.tar.bz2 | |
Update.
2001-10-04 Ben Collins <bcollins@debian.org>
* sysdeps/generic/inttypes.h: Fix typo (define, not defined) in
decleration of __need_wchar_t.
2001-10-03 Jakub Jelinek <jakub@redhat.com>
* string/bits/string2.h (__strsep_g): Add prototype.
(__strsep): Use it.
* string/Versions (__strsep): Remove.
* sysdeps/generic/strsep.c (__strsep_g): Add alias to __strsep.
2001-10-07 Ulrich Drepper <drepper@redhat.com>
* manua/llio.texi: Clarify file references added by mmap.
Patch by Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>.
Diffstat (limited to 'string')
| -rw-r--r-- | string/Versions | 3 | ||||
| -rw-r--r-- | string/bits/string2.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/string/Versions b/string/Versions index 171b9c5..2708091 100644 --- a/string/Versions +++ b/string/Versions @@ -73,7 +73,4 @@ libc { # m* memrchr; } - GLIBC_2.2.5 { - __strsep; - } } diff --git a/string/bits/string2.h b/string/bits/string2.h index 0078af9..aafb578 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1087,6 +1087,8 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp) #if !defined _HAVE_STRING_ARCH_strsep || defined _FORCE_INLINES # ifndef _HAVE_STRING_ARCH_strsep + +extern char *__strsep_g (char **__stringp, __const char *__delim); # define __strsep(s, reject) \ __extension__ \ ({ char __r0, __r1, __r2; \ @@ -1100,8 +1102,8 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp) ? __strsep_2c (s, __r0, __r1) \ : (((__const char *) (reject))[3] == '\0' \ ? __strsep_3c (s, __r0, __r1, __r2) \ - : __strsep (s, reject)))) \ - : __strsep (s, reject)); }) + : __strsep_g (s, reject)))) \ + : __strsep_g (s, reject)); }) # endif __STRING_INLINE char *__strsep_1c (char **__s, char __reject); |