merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 12dbff8de6941afde31851dc511b94f441e8ed62..c8ea33315254f595873b22837fc7f484ce394146 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-08  Adam Nemet  <anemet@lnxw.com>
+
+       * vasprintf.c: Accept __va_copy in addition to va_copy.
+
 2004-09-03  Paolo Bonzini  <bonzini@gnu.org> 
 
        * configure: Regenerate.

diff --git a/libiberty/vasprintf.c b/libiberty/vasprintf.c
index d3d4f3a1553bebc2b14bbdc6c92861a6917d74b0..7eaf2b18d6fd87a42d20716a27583da8686c32d1 100644 (file)
--- a/libiberty/vasprintf.c
+++ b/libiberty/vasprintf.c
@@ -27,6 +27,9 @@ Boston, MA 02111-1307, USA.  */
 #else
 #include <varargs.h>
 #endif
+#if !defined (va_copy) && defined (__va_copy)
+# define va_copy(d,s)  __va_copy((d),(s))
+#endif
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>