* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST

[pspp] / lib / string_.h

diff --git a/lib/string_.h b/lib/string_.h
index 6ec72c3e7f5670631df39b611209c335a7aedfa0..bfb22b0ebc40948d16d92c036ba05cadce39f204 100644 (file)
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -19,11 +19,7 @@
 #ifndef _GL_STRING_H
 
 /* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_INCLUDE_NEXT@
-# include_next <string.h>
-#else
-# include @ABSOLUTE_STRING_H@
-#endif
+#@INCLUDE_NEXT@ @NEXT_STRING_H@
 
 #ifndef _GL_STRING_H
 #define _GL_STRING_H
@@ -401,6 +397,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.