From 463d6e68a8f42423169e4359cc5c8636f6c92589 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 24 Jul 2020 17:28:11 +0300 Subject: Release version 1.6.3+4 Fix GCC 10 -Wformat warning Canonicalize license in manifest Add glue buildfile Fix typo in .gitattributes --- libpkgconf/libpkgconf/libpkgconf.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libpkgconf/libpkgconf/libpkgconf.h') diff --git a/libpkgconf/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf/libpkgconf.h index 6f4c8b5..a7d9f9d 100644 --- a/libpkgconf/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf/libpkgconf.h @@ -257,9 +257,17 @@ PKGCONF_API pkgconf_cross_personality_t *pkgconf_cross_personality_find(const ch #define PKGCONF_PKG_ERRF_PACKAGE_CONFLICT 0x4 #define PKGCONF_PKG_ERRF_DEPGRAPH_BREAK 0x8 +/* Note that MinGW's printf() format semantics have changed starting GCC 10 + * (see stdinc.h for details). + */ #if defined(__GNUC__) || defined(__INTEL_COMPILER) -#define PRINTFLIKE(fmtarg, firstvararg) \ - __attribute__((__format__ (__printf__, fmtarg, firstvararg))) +# if defined (_WIN32) && defined(__GNUC__) && __GNUC__ >= 10 +# define PRINTFLIKE(fmtarg, firstvararg) \ + __attribute__((__format__ (gnu_printf, fmtarg, firstvararg))) +# else +# define PRINTFLIKE(fmtarg, firstvararg) \ + __attribute__((__format__ (__printf__, fmtarg, firstvararg))) +#endif #define DEPRECATED \ __attribute__((deprecated)) #else -- cgit v1.1