diff options
| author | Gabriel F. T. Gomes <gabrielftg@linux.ibm.com> | 2019-11-14 09:25:14 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabrielftg@linux.ibm.com> | 2019-11-22 15:29:21 -0300 |
| commit | 93486ba583ecef1ba17357cfeb658ce3bea583bd (patch) | |
| tree | f98adc23b103fb7408bf1cba4b1a48d87944bf07 /wcsmbs | |
| parent | 8781c1301d55db0a95398eb24c11b99205706bae (diff) | |
| download | glibc-93486ba583ecef1ba17357cfeb658ce3bea583bd.tar.gz glibc-93486ba583ecef1ba17357cfeb658ce3bea583bd.tar.xz glibc-93486ba583ecef1ba17357cfeb658ce3bea583bd.zip | |
Use DEPRECATED_SCANF macro for remaining C99-compliant scanf functions
When the commit
commit 03992356e6fedc5a5e9d32df96c1a2c79ea28a8f
Author: Zack Weinberg <zackw@panix.com>
Date: Sat Feb 10 11:58:35 2018 -0500
Use C99-compliant scanf under _GNU_SOURCE with modern compilers.
added the DEPRECATED_SCANF macro to select when redirections of *scanf
functions to their ISO C99 compliant versions should happen, it
accidentally missed doing it for vfwscanf, vwscanf, and vswscanf.
Tested for powerpc64le and with build-many-glibcs (i686-linux-gnu and
nios2-linux-gnu are failing with current master, and with this patch,
but I didn't see a regression).
Change-Id: I706b344a3fb50be017cdab9251d9da18a3ba8c60
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wchar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 4b731ebb51..fc62fa3e26 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -685,7 +685,8 @@ extern int vswscanf (const wchar_t *__restrict __s, __gnuc_va_list __arg) __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */; -# if !defined __USE_GNU \ +/* Same redirection as above for the v*wscanf family. */ +# if !__GLIBC_USE (DEPRECATED_SCANF) \ && (!defined __LDBL_COMPAT || !defined __REDIRECT) \ && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K) # ifdef __REDIRECT |