diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-09-10 08:30:04 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-09-10 08:30:04 +0200 |
| commit | 75de900398172062f40f43a6ac72434f5685a0e4 (patch) | |
| tree | 18a7958c96dd77ada3b36276811e31b2dc2fa47e /gl/string.in.h | |
| parent | 2f7caa7fd9a7830294d20145a8a75c9308be9dd0 (diff) | |
| download | gnutls-75de900398172062f40f43a6ac72434f5685a0e4.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl/string.in.h')
| -rw-r--r-- | gl/string.in.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gl/string.in.h b/gl/string.in.h index 079f2df5cf..3d0c7d1d2d 100644 --- a/gl/string.in.h +++ b/gl/string.in.h @@ -203,11 +203,11 @@ extern char *strdup (char const *__s); /* Return a newly allocated copy of at most N bytes of STRING. */ #if @GNULIB_STRNDUP@ -# if ! @HAVE_STRNDUP@ +# if @REPLACE_STRNDUP@ # undef strndup # define strndup rpl_strndup # endif -# if ! @HAVE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@ +# if @REPLACE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@ extern char *strndup (char const *__string, size_t __n); # endif #elif defined GNULIB_POSIXCHECK @@ -399,7 +399,13 @@ extern char *strcasestr (const char *haystack, const char *needle) See also strsep(). */ #if @GNULIB_STRTOK_R@ -# if ! @HAVE_DECL_STRTOK_R@ +# if @REPLACE_STRTOK_R@ +# undef strtok_r +# define strtok_r rpl_strtok_r +# elif @UNDEFINE_STRTOK_R@ +# undef strtok_r +# endif +# if ! @HAVE_DECL_STRTOK_R@ || @REPLACE_STRTOK_R@ extern char *strtok_r (char *restrict s, char const *restrict delim, char **restrict save_ptr); # endif |