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

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index aaa86ad8b6342601904710d0c684879ece52b2f1..89116061dfb626b5c96933ece0a9da373bc2f398 100644 (file)
--- 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 e2dba5ba55d594f9bfb654e0bc8be23dda2e7891..918e41569c613b24283c4bba923f3b9a056edda5 100644 (file)
--- 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