From 37b1a1540170d8154435099d50da5b34a56bdbf1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 11 Nov 2004 22:15:51 +0000 Subject: [PATCH] [BZ #542] 2004-11-11 Simon Josefsson [BZ #542] * sysdeps/generic/strtok_r.c [HAVE_CONFIG_H]: Include config.h. [!_LIBC]: Include strtok_r.h (in gnulib), map __strtok_r to strtok_r and __rawmemchr to strch. (__strtok_r): Use C89 prototype. [weak_alias]: Move calls to libc_hidden_def and weak_alias into this #ifdef. --- ChangeLog | 10 ++++++++++ sysdeps/generic/strtok_r.c | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41dedbb..c89325a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-11-11 Simon Josefsson + + [BZ #542] + * sysdeps/generic/strtok_r.c [HAVE_CONFIG_H]: Include config.h. + [!_LIBC]: Include strtok_r.h (in gnulib), map __strtok_r to + strtok_r and __rawmemchr to strch. + (__strtok_r): Use C89 prototype. + [weak_alias]: Move calls to libc_hidden_def and weak_alias into + this #ifdef. + 2004-11-10 Paul Eggert [BZ #541] diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 3a5c047..b11cb52 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 +#endif + #include #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 -- 2.7.4