Declare memccpy, strdup, strndup for C2X.

C2X adds the memccpy, strdup and strndup functions.  This patch duly
adds __GLIBC_USE (ISOC2X) to the conditions under which <string.h>
declares them.

Tested for x86_64.

	* string/string.h (memccpy): Also declare if [__GLIBC_USE (ISOC2X)].
	(strdup): Likewise.
	(strndup): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9263294b0729b399cbc4d62323f3ccffd9858c44..7bf0821242325ce9af39c8d03c57c37a4883819e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-08-13  Joseph Myers  <joseph@codesourcery.com>
 
+       * string/string.h (memccpy): Also declare if [__GLIBC_USE (ISOC2X)].
+       (strdup): Likewise.
+       (strndup): Likewise.
+
        * include/features.h (_ISOC2X_SOURCE): New feature test macro.
        Undefine and define to 1 if [_GNU_SOURCE].
        (__GLIBC_USE_ISOC2X): New macro.  Undefine and redefine depending

diff --git a/string/string.h b/string/string.h
index c38eea971f4396c678598f51602082318ec5349d..f51a9e2270ad5c743962ce215a0f21f634948ff5 100644 (file)
--- a/string/string.h
+++ b/string/string.h
@@ -49,7 +49,7 @@ extern void *memmove (void *__dest, const void *__src, size_t __n)
 /* Copy no more than N bytes of SRC to DEST, stopping when C is found.
    Return the position in DEST one byte past where C was copied,
    or NULL if C was not found in the first N bytes of SRC.  */
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || defined __USE_XOPEN || __GLIBC_USE (ISOC2X)
 extern void *memccpy (void *__restrict __dest, const void *__restrict __src,
                      int __c, size_t __n)
      __THROW __nonnull ((1, 2));
@@ -161,7 +161,7 @@ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n,
 #endif
 
 #if (defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8    \
-     || __GLIBC_USE (LIB_EXT2))
+     || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC2X))
 /* Duplicate S, returning an identical malloc'd string.  */
 extern char *strdup (const char *__s)
      __THROW __attribute_malloc__ __nonnull ((1));
@@ -170,7 +170,7 @@ extern char *strdup (const char *__s)
 /* Return a malloc'd copy of at most N bytes of STRING.  The
    resultant string is terminated even if no null terminator
    appears before STRING[N].  */
-#if defined __USE_XOPEN2K8 || __GLIBC_USE (LIB_EXT2)
+#if defined __USE_XOPEN2K8 || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC2X)
 extern char *strndup (const char *__string, size_t __n)
      __THROW __attribute_malloc__ __nonnull ((1));
 #endif