diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-12 16:56:15 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-12 16:56:15 +0000 |
| commit | 8ae4ba1c6d925bdd110d6bbc04f6338065dd56ac (patch) | |
| tree | 48c51adddf5da14da5cf924e6c6e6e946eaea57f /sysdeps/generic | |
| parent | 9abf55c24c31a53d987ebf53e46cbd64eab417bc (diff) | |
| download | glibc-8ae4ba1c6d925bdd110d6bbc04f6338065dd56ac.tar.gz glibc-8ae4ba1c6d925bdd110d6bbc04f6338065dd56ac.tar.xz glibc-8ae4ba1c6d925bdd110d6bbc04f6338065dd56ac.zip | |
Updated to fedora-glibc-20041112T1640
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/strtok_r.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 3a5c047b8c..b11cb520f6 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -17,11 +17,22 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <string.h> #undef strtok_r #undef __strtok_r +#ifndef _LIBC +/* Get specification. */ +# include "strtok_r.h" +# define __strtok_r strtok_r +# define __rawmemchr strchr +#endif + /* Parse S into tokens separated by characters in DELIM. If S is NULL, the saved pointer in SAVE_PTR is used as the next starting point. For example: @@ -33,10 +44,7 @@ // s = "abc\0-def\0" */ char * -__strtok_r (s, delim, save_ptr) - char *s; - const char *delim; - char **save_ptr; +__strtok_r (char *s, const char *delim, char **save_ptr) { char *token; @@ -65,5 +73,7 @@ __strtok_r (s, delim, save_ptr) } return token; } +#ifdef weak_alias libc_hidden_def (__strtok_r) weak_alias (__strtok_r, strtok_r) +#endif |