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 /libio | |
| 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 'libio')
| -rw-r--r-- | libio/bits/stdio-ldbl.h | 8 | ||||
| -rw-r--r-- | libio/stdio.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h index e81ad173c1..a0d1de0693 100644 --- a/libio/bits/stdio-ldbl.h +++ b/libio/bits/stdio-ldbl.h @@ -28,7 +28,7 @@ __LDBL_REDIR_DECL (vprintf) __LDBL_REDIR_DECL (vsprintf) #if !__GLIBC_USE (DEPRECATED_SCANF) # if defined __LDBL_COMPAT -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) __LDBL_REDIR1_DECL (fscanf, __nldbl___isoc23_fscanf) __LDBL_REDIR1_DECL (scanf, __nldbl___isoc23_scanf) __LDBL_REDIR1_DECL (sscanf, __nldbl___isoc23_sscanf) @@ -38,7 +38,7 @@ __LDBL_REDIR1_DECL (scanf, __nldbl___isoc99_scanf) __LDBL_REDIR1_DECL (sscanf, __nldbl___isoc99_sscanf) # endif # elif __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) __LDBL_REDIR1_DECL (fscanf, __isoc23_fscanfieee128) __LDBL_REDIR1_DECL (scanf, __isoc23_scanfieee128) __LDBL_REDIR1_DECL (sscanf, __isoc23_sscanfieee128) @@ -64,7 +64,7 @@ __LDBL_REDIR_DECL (vsnprintf) #ifdef __USE_ISOC99 # if !__GLIBC_USE (DEPRECATED_SCANF) # if defined __LDBL_COMPAT -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) __LDBL_REDIR1_DECL (vfscanf, __nldbl___isoc23_vfscanf) __LDBL_REDIR1_DECL (vscanf, __nldbl___isoc23_vscanf) __LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc23_vsscanf) @@ -74,7 +74,7 @@ __LDBL_REDIR1_DECL (vscanf, __nldbl___isoc99_vscanf) __LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc99_vsscanf) # endif # elif __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) __LDBL_REDIR1_DECL (vfscanf, __isoc23_vfscanfieee128) __LDBL_REDIR1_DECL (vscanf, __isoc23_vscanfieee128) __LDBL_REDIR1_DECL (vsscanf, __isoc23_vsscanfieee128) diff --git a/libio/stdio.h b/libio/stdio.h index 6762cffb0f..cbecabe1d9 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -139,7 +139,7 @@ typedef __fpos64_t fpos64_t; #define FOPEN_MAX 16 -#if __GLIBC_USE (ISOC2X) +#if __GLIBC_USE (ISOC23) /* Maximum length of printf output for a NaN. */ # define _PRINTF_NAN_LEN_MAX 4 #endif @@ -437,7 +437,7 @@ extern int sscanf (const char *__restrict __s, #include <bits/floatn.h> #if !__GLIBC_USE (DEPRECATED_SCANF) && !defined __LDBL_COMPAT \ && __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 0 -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) # ifdef __REDIRECT extern int __REDIRECT (fscanf, (FILE *__restrict __stream, const char *__restrict __format, ...), @@ -505,7 +505,7 @@ extern int vsscanf (const char *__restrict __s, /* Same redirection as above for the v*scanf family. */ # if !__GLIBC_USE (DEPRECATED_SCANF) -# if __GLIBC_USE (C2X_STRTOL) +# if __GLIBC_USE (C23_STRTOL) # if defined __REDIRECT && !defined __LDBL_COMPAT \ && __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 0 extern int __REDIRECT (vfscanf, |