math: Fix some C++ test errors on Solaris 8.

[pspp] / lib / printf.c

diff --git a/lib/printf.c b/lib/printf.c
index 1945984afe95b84cd1e299e6092c55f3ff2c43d7..c48042a58f24da2eb3407b02fc3de20f1d4cd808 100644 (file)
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -1,19 +1,18 @@
 /* Formatted output to a stream.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -24,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.  */
@@ -39,3 +40,5 @@ printf (const char *format, ...)
 
   return retval;
 }
+
+#endif