Avoid a link error on mingw.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 55a656740f5e0a2c41192d87a9bdd17167999666..19cd9e0471b445408510cd924e774ae75c2a129b 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-13  Bruno Haible  <bruno@clisp.org>
+
+       * printf.c (libintl_printf): Define to __printf__ on NetBSD, Cygwin,
+       mingw.
+       Reported by haibin zhang <dragzhb@yahoo.com.cn>.
+
 2006-06-22  Ulrich Drepper  <drepper@redhat.com>
 
        * dcigettext.c (DCIGETTEXT): If _nl_find_msg returns -1 don't look

diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
index 5e112b69bf42130567eb203bdd824dc37a5a0589..275968b3777eaa66ae985f9a6d5dd5881913a38f 100644 (file)
--- a/gettext-runtime/intl/printf.c
+++ b/gettext-runtime/intl/printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify it
@@ -61,6 +61,14 @@ char *alloca ();
 
 #define STATIC static
 
+/* This needs to be consistent with libgnuintl.h.in.  */
+#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 auxiliary functions declared in "printf-args.h".  */
 #include "printf-args.c"