diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-06-11 10:51:03 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-06-11 10:51:03 +0200 |
| commit | 609e3c695319d84bc009520bba0dbebebed2f289 (patch) | |
| tree | 05ab566b815e4340e18cdb27bbf49d72a5f07816 /gl | |
| parent | c86c105e35466f58203a41b2bd9cd94c9967602d (diff) | |
| download | gnutls-609e3c695319d84bc009520bba0dbebebed2f289.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/gnulib.mk | 1 | ||||
| -rw-r--r-- | gl/m4/string_h.m4 | 1 | ||||
| -rw-r--r-- | gl/string_.h | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/gl/gnulib.mk b/gl/gnulib.mk index c3bca97574..47c97abb68 100644 --- a/gl/gnulib.mk +++ b/gl/gnulib.mk @@ -192,6 +192,7 @@ string.h: string_.h sed -e 's|@''ABSOLUTE_STRING_H''@|$(ABSOLUTE_STRING_H)|g' \ -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ + -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \ -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \ -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \ diff --git a/gl/m4/string_h.m4 b/gl/m4/string_h.m4 index f706d491be..ab5d786988 100644 --- a/gl/m4/string_h.m4 +++ b/gl/m4/string_h.m4 @@ -46,6 +46,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) + GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) diff --git a/gl/string_.h b/gl/string_.h index 6ec72c3e7f..4dbe66ccc4 100644 --- a/gl/string_.h +++ b/gl/string_.h @@ -401,6 +401,12 @@ extern char *strtok_r (char *restrict s, char const *restrict delim, extern size_t mbslen (const char *string); #endif +#if @GNULIB_MBSNLEN@ +/* Return the number of multibyte characters in the character string starting + at STRING and ending at STRING + LEN. */ +extern size_t mbsnlen (const char *string, size_t len); +#endif + #if @GNULIB_MBSCHR@ /* Locate the first single-byte character C in the character string STRING, and return a pointer to it. Return NULL if C is not found in STRING. |