Avoid collision between gnulib wrapper and libintl wrapper.

diff --git a/ChangeLog b/ChangeLog
index 8e79cc67039a470fdac6573744746d7e89ce2717..3384fb7d219fdae50fd9f1d9a9ad5deed1a6ed6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-25  Bruno Haible  <bruno@clisp.org>
+
+       Avoid collision between gnulib wrapper and libintl wrapper.
+       * lib/printf.c (printf): Don't define if a printf wrapper is already
+       defined in intl/printf.c.
+       Reported by Michel Boaventura <michel@michelboaventura.com>.
+
 2010-03-25  Bruno Haible  <bruno@clisp.org>
 
        Use ANSI C.

diff --git a/lib/printf.c b/lib/printf.c
index d09608675bc00b511a8e412e7cb4c4dc868a662b..c48042a58f24da2eb3407b02fc3de20f1d4cd808 100644 (file)
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to a stream.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 
 #include <stdarg.h>
 
+#if !DEPENDS_ON_LIBINTL /* avoid collision with intl/printf.c */
+
 /* Print formatted output to standard output.
    Return string length of formatted string.  On error, return a negative
    value.  */
@@ -38,3 +40,5 @@ printf (const char *format, ...)
 
   return retval;
 }
+
+#endif