Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13053:1ea205413d02
Avoid collision between gnulib wrapper and libintl wrapper.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 25 Mar 2010 08:06:00 +0100 |
| parents | 082bcf732231 |
| children | 0b6e401a5e89 |
| files | ChangeLog lib/printf.c |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 @@ return retval; } + +#endif