diff options
| author | Joseph Myers <josmyers@redhat.com> | 2024-02-01 11:02:01 +0000 |
|---|---|---|
| committer | Joseph Myers <josmyers@redhat.com> | 2024-02-01 11:02:01 +0000 |
| commit | 42cc619dfbc44e263239c2de870bae11ad65810a (patch) | |
| tree | 13f7e2f0ad1e9b3c4a36f9ecd4e3e49b1d268120 /string | |
| parent | 7c8df0b9441e34928f2d7d70531e3d55e016c32e (diff) | |
| download | glibc-42cc619dfbc44e263239c2de870bae11ad65810a.tar.gz glibc-42cc619dfbc44e263239c2de870bae11ad65810a.tar.xz glibc-42cc619dfbc44e263239c2de870bae11ad65810a.zip | |
Refer to C23 in place of C2X in glibc
WG14 decided to use the name C23 as the informal name of the next revision of the C standard (notwithstanding the publication date in 2024). Update references to C2X in glibc to use the C23 name. This is intended to update everything *except* where it involves renaming files (the changes involving renaming tests are intended to be done separately). In the case of the _ISOC2X_SOURCE feature test macro - the only user-visible interface involved - support for that macro is kept for backwards compatibility, while adding _ISOC23_SOURCE. Tested for x86_64.
Diffstat (limited to 'string')
| -rw-r--r-- | string/string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/string/string.h b/string/string.h index 10fca472a7..d2d5c5f1f9 100644 --- a/string/string.h +++ b/string/string.h @@ -50,7 +50,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 || __GLIBC_USE (ISOC2X) +#if defined __USE_MISC || defined __USE_XOPEN || __GLIBC_USE (ISOC23) extern void *memccpy (void *__restrict __dest, const void *__restrict __src, int __c, size_t __n) __THROW __nonnull ((1, 2)) __attr_access ((__write_only__, 1, 4)); @@ -182,7 +182,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 (ISOC2X)) + || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC23)) /* Duplicate S, returning an identical malloc'd string. */ extern char *strdup (const char *__s) __THROW __attribute_malloc__ __nonnull ((1)); @@ -191,7 +191,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) || __GLIBC_USE (ISOC2X) +#if defined __USE_XOPEN2K8 || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC23) extern char *strndup (const char *__string, size_t __n) __THROW __attribute_malloc__ __nonnull ((1)); #endif |