From: Bruno Haible <bruno@clisp.org>
Date: Tue, 20 Jun 2006 11:30:10 +0000 (+0000)
Subject: Avoid gcc warnings when __attribute__((format(printf,M,N))) is used.
X-Git-Tag: v0.15~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7653715e8bf7daee3bd9e9c11737f30d1e21307b;p=thirdparty%2Fgettext.git

Avoid gcc warnings when __attribute__((format(printf,M,N))) is used.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index aaa86ad8b..89116061d 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-19  Bruno Haible  <bruno@clisp.org>
+
+	* libgnuintl.h.in (libintl_printf): Define to __printf__ on NetBSD,
+	Cygwin, mingw.
+	Reported by Henry Nelson <netb@yuba.ne.jp>.
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
 	* bindtextdom.c (gl_rwlock_define, gl_rwlock_wrlock, gl_rwlock_unlock)
diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.h.in
index e2dba5ba5..918e41569 100644
--- a/gettext-runtime/intl/libgnuintl.h.in
+++ b/gettext-runtime/intl/libgnuintl.h.in
@@ -330,6 +330,12 @@ extern int fprintf (FILE *, const char *, ...);
 extern int vfprintf (FILE *, const char *, va_list);
 
 #undef printf
+#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
+/* Don't break __attribute__((format(printf,M,N))).
+   This redefinition is only possible because the libc in NetBSD, Cygwin,
+   mingw does not have a function __printf__.  */
+# define libintl_printf __printf__
+#endif
 #define printf libintl_printf
 extern int printf (const char *, ...);
 #undef vprintf