From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VwyBf-0003RS-7I for mharc-grub-devel@gnu.org; Sat, 28 Dec 2013 13:00:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwyBV-0003RL-1T for grub-devel@gnu.org; Sat, 28 Dec 2013 13:00:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwyBM-0001oa-Fy for grub-devel@gnu.org; Sat, 28 Dec 2013 13:00:24 -0500 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:53403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwyBM-0001oN-7Y for grub-devel@gnu.org; Sat, 28 Dec 2013 13:00:16 -0500 Received: by mail-lb0-f172.google.com with SMTP id x18so4811075lbi.17 for ; Sat, 28 Dec 2013 10:00:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=iyyWixE+Ojkh9LcMJke3MLn87GXJ1obI0ivjpkKPfqc=; b=S5P0FwFZr732+S9skHxiWhmeZSJT4tcRgYV2LKZvasf1grEcHb656v0bi3JZ2Rhbl4 ndoseQVkggU9MDzZz05NvMidmVr47rV3gL6l47Kh0NFnjyPHPs5luFRlWn8Y5PCGFKQH 8yPvxDTBTy8L64w5QYmUgscFA8H74vW+boEGsoD2/ujrUKOkoZioHflFktg2RQzkdJAv 7Mz8vQwvAQ97kFE28DpmKIXO+lSMsg2yIOGYJqYwYkP1SKHQlrMZM/XH3cPMb9F66FJp ebs9fRnan7VM8jApKVeOJiXpTBIdmHwvWmPjn08yBwifK0rOwk+lfIExGR4e8LEuEO8B jgKA== X-Received: by 10.152.19.97 with SMTP id d1mr6023905lae.57.1388253614947; Sat, 28 Dec 2013 10:00:14 -0800 (PST) Received: from localhost.localdomain (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id qx1sm23789964lbb.15.2013.12.28.10.00.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Dec 2013 10:00:14 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] fix mingw cross compile failure due to printf redefinition in libintl.h Date: Sat, 28 Dec 2013 22:00:11 +0400 Message-Id: <1388253611-16848-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22c X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 18:00:33 -0000 In file included from util/misc.c:36:0: ./include/grub/emu/misc.h:56:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=] char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT; ^ ./include/grub/emu/misc.h:58:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=] The reason is libintl.h which redefines printf as libintl_printf. The problem is not present in native mingw build which avoids redefinition. Use (format (__printf__) instead which is valid replacement in GCC. --- include/grub/crypto.h | 2 +- include/grub/emu/misc.h | 8 ++++---- include/grub/err.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/grub/crypto.h b/include/grub/crypto.h index ec1b980..a24e89d 100644 --- a/include/grub/crypto.h +++ b/include/grub/crypto.h @@ -408,7 +408,7 @@ void _gcry_assert_failed (const char *expr, const char *file, int line, const char *func) __attribute__ ((noreturn)); void _gcry_burn_stack (int bytes); -void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); +void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (__printf__, 1, 2))); #ifdef GRUB_UTIL diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h index dde48c1..a588ba2 100644 --- a/include/grub/emu/misc.h +++ b/include/grub/emu/misc.h @@ -53,11 +53,11 @@ grub_util_device_is_mapped (const char *dev); void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT; void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT; char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT; -char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT; +char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))) WARN_UNUSED_RESULT; -void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2), noreturn)); +void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))); +void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))); +void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2), noreturn)); grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void); diff --git a/include/grub/err.h b/include/grub/err.h index 9896fcc..1590c68 100644 --- a/include/grub/err.h +++ b/include/grub/err.h @@ -91,6 +91,6 @@ int EXPORT_FUNC(grub_error_pop) (void); void EXPORT_FUNC(grub_print_error) (void); extern int EXPORT_VAR(grub_err_printed_errors); int grub_err_printf (const char *fmt, ...) - __attribute__ ((format (printf, 1, 2))); + __attribute__ ((format (__printf__, 1, 2))); #endif /* ! GRUB_ERR_HEADER */ -- tg: (093dec7..) u/mingw/attribute_printf (depends on: master)