From: Bruno Haible <bruno@clisp.org>
Date: Thu, 29 Mar 2007 22:32:09 +0000 (+0000)
Subject: Sync with gnulib.
X-Git-Tag: v0.17~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23562e2b491978c1caa6d7ec9b4a4d6a731ce3ed;p=thirdparty%2Fgettext.git

Sync with gnulib.
---

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 7482b588e..319286f76 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29  Bruno Haible  <bruno@clisp.org>
+
+	* vasprintf.c: Sync with gnulib.
+	* asprintf.c: Likewise.
+
 2007-03-25  Bruno Haible  <bruno@clisp.org>
 
 	* lib/printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
diff --git a/gettext-runtime/libasprintf/asprintf.c b/gettext-runtime/libasprintf/asprintf.c
index 79a03b00e..87d2128c8 100644
--- a/gettext-runtime/libasprintf/asprintf.c
+++ b/gettext-runtime/libasprintf/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -19,7 +19,11 @@
 #include <config.h>
 
 /* Specification.  */
-#include "vasprintf.h"
+#ifdef IN_LIBASPRINTF
+# include "vasprintf.h"
+#else
+# include <stdio.h>
+#endif
 
 #include <stdarg.h>
 
diff --git a/gettext-runtime/libasprintf/vasprintf.c b/gettext-runtime/libasprintf/vasprintf.c
index 34117059f..785468fec 100644
--- a/gettext-runtime/libasprintf/vasprintf.c
+++ b/gettext-runtime/libasprintf/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -19,7 +19,11 @@
 #include <config.h>
 
 /* Specification.  */
-#include "vasprintf.h"
+#ifdef IN_LIBASPRINTF
+# include "vasprintf.h"
+#else
+# include <stdio.h>
+#endif
 
 #include <errno.h>
 #include <limits.h>