On Sat, Feb 06, 2021 at 09:01:10PM +1100, Jonathan Gray wrote: > The gnu_printf format attribute was introduced in gcc 4.4.0 > https://gcc.gnu.org/legacy-ml/gcc-help/2012-02/msg00225.html. > > Use the printf format attribute on earlier versions of gcc and clang > (which claims to be gcc 4.2.1 in builtin defines) to fix the build with > gcc 4.2.1. > > Fixes: 588a29f ("util: use gnu_printf format attribute") > Signed-off-by: Jonathan Gray <jsg@xxxxxxxxx> Applied, thanks. > --- > util.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/util.h b/util.h > index a771b46..c45b2c2 100644 > --- a/util.h > +++ b/util.h > @@ -13,10 +13,10 @@ > */ > > #ifdef __GNUC__ > -#ifdef __clang__ > -#define PRINTF(i, j) __attribute__((format (printf, i, j))) > -#else > +#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) > #define PRINTF(i, j) __attribute__((format (gnu_printf, i, j))) > +#else > +#define PRINTF(i, j) __attribute__((format (printf, i, j))) > #endif > #define NORETURN __attribute__((noreturn)) > #else -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
