>From e75f9249df14b9292d39d3881441775905e35ac5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 9 May 2020 12:58:23 +0200 Subject: [PATCH 2/2] stdio, monetary: Don't redefine _GL_ATTRIBUTE_FORMAT. * lib/stdio.in.h (_GL_ATTRIBUTE_FORMAT): Don't override the definition that usually comes from m4/gnulib-common.m4. * lib/monetary.in.h (_GL_ATTRIBUTE_FORMAT): Likewise. --- ChangeLog | 7 +++++++ lib/monetary.in.h | 10 ++++++---- lib/stdio.in.h | 10 ++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 065628f..7f19e4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2020-05-09 Bruno Haible + stdio, monetary: Don't redefine _GL_ATTRIBUTE_FORMAT. + * lib/stdio.in.h (_GL_ATTRIBUTE_FORMAT): Don't override the definition + that usually comes from m4/gnulib-common.m4. + * lib/monetary.in.h (_GL_ATTRIBUTE_FORMAT): Likewise. + +2020-05-09 Bruno Haible + dirent, stdlib, wchar, string: Don't redefine _GL_ATTRIBUTE_PURE. * lib/dirent.in.h (_GL_ATTRIBUTE_PURE): Don't override the definition that usually comes from m4/gnulib-common.m4. diff --git a/lib/monetary.in.h b/lib/monetary.in.h index 456a153..4061319 100644 --- a/lib/monetary.in.h +++ b/lib/monetary.in.h @@ -39,10 +39,12 @@ #endif /* Like in . */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +#ifndef _GL_ATTRIBUTE_FORMAT +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +# endif #endif /* _GL_ATTRIBUTE_FORMAT_STRFMON diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 839a14b..0823e62 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -62,10 +62,12 @@ We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +#ifndef _GL_ATTRIBUTE_FORMAT +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +# endif #endif /* _GL_ATTRIBUTE_FORMAT_PRINTF -- 2.7.4