diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
| commit | f87c7bd4133a2b3ad9b45c32fab33d167a348c4b (patch) | |
| tree | 7259957b97704c375b3d8ab42f8da3d52665845e /libc/string/generic/strtok_r.c | |
| parent | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (diff) | |
| download | uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.bz2 uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.xz | |
Massive merge from trunk.
Diffstat (limited to 'libc/string/generic/strtok_r.c')
| -rw-r--r-- | libc/string/generic/strtok_r.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libc/string/generic/strtok_r.c b/libc/string/generic/strtok_r.c index 15ca8b4ba..40d4e1a78 100644 --- a/libc/string/generic/strtok_r.c +++ b/libc/string/generic/strtok_r.c @@ -21,7 +21,6 @@ #include <string.h> #undef strtok_r -#undef __strtok_r /* Parse S into tokens separated by characters in DELIM. If S is NULL, the saved pointer in SAVE_PTR is used as @@ -33,8 +32,7 @@ x = strtok_r(NULL, "=", &sp); // x = NULL // s = "abc\0-def\0" */ -char * -__strtok_r (s, delim, save_ptr) +char attribute_hidden *__strtok_r (s, delim, save_ptr) char *s; const char *delim; char **save_ptr; @@ -66,4 +64,5 @@ __strtok_r (s, delim, save_ptr) } return token; } -weak_alias (__strtok_r, strtok_r) + +strong_alias(__strtok_r, strtok_r) |