From: Bruno Haible <bruno@clisp.org>
Date: Thu, 25 Mar 2010 07:06:00 +0000 (+0100)
Subject: Avoid collision between gnulib wrapper and libintl wrapper.
X-Git-Tag: v0.1~4434
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=784afc2436790a775b5a48e610e9d532885c692e;p=gnulib.git

Avoid collision between gnulib wrapper and libintl wrapper.
---

diff --git a/ChangeLog b/ChangeLog
index 8e79cc670..3384fb7d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
 	* lib/readutmp.h (getutent): Provide ANSI C prototype.
 
diff --git a/lib/printf.c b/lib/printf.c
index d09608675..c48042a58 100644
--- 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