From 784afc2436790a775b5a48e610e9d532885c692e Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Thu, 25 Mar 2010 08:06:00 +0100
Subject: [PATCH] Avoid collision between gnulib wrapper and libintl wrapper.
---
ChangeLog | 7 +++++++
lib/printf.c | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8e79cc6703..3384fb7d21 100644
--- 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 d09608675b..c48042a58f 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
--
2.30.2