From 325422e668ec417c1e2c430aa5132f35361b0962 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Sat, 9 Jan 2021 13:48:20 +0100 Subject: maint: fix GCC format attribute of checked_fprintf * gnulib-local/lib/gcc-function-attributes.h: Rename _GL_ATTRIBUTE_FORMAT_PRINTF to _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD following gnulib's change: https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=387d654c * find/print.c (checked_fprintf): Use it. --- gnulib-local/lib/gcc-function-attributes.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnulib-local') diff --git a/gnulib-local/lib/gcc-function-attributes.h b/gnulib-local/lib/gcc-function-attributes.h index 7ef3bd10..c1e95f3d 100644 --- a/gnulib-local/lib/gcc-function-attributes.h +++ b/gnulib-local/lib/gcc-function-attributes.h @@ -56,7 +56,7 @@ externally_visible flatten format _GL_ATTRIBUTE_FORMAT(spec) _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(fmt,firstarg) - _GL_ATTRIBUTE_FORMAT_PRINTF(fmt,firstarg) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(fmt,firstarg) _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(fmt,firstarg) _GL_ATTRIBUTE_FORMAT_SCANF(fmt,firstarg) format_arg @@ -131,17 +131,17 @@ visibility "default" # endif # endif -# ifndef _GL_ATTRIBUTE_FORMAT_PRINTF +# ifndef _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD # if __GNUC_PREREQ(2,7) # if __GNUC_PREREQ(4,4) -# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ +# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) # else -# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ +# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) # endif # else -# define _GL_ATTRIBUTE_FORMAT_PRINTF(spec) /* unsupported */ +# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(spec) /* unsupported */ # endif # endif -- cgit v1.2.1