Fix the use of va_copy on x86_64.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index cddc34a2ba8a366f3ce109ae3fded98e7f1bed08..1f5c0420c84ea598e387b6906e2739796dc21b12 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-16  Bruno Haible  <bruno@clisp.org>
+
+       * modules/libxml (Depends-on): Add stdarg.
+       * m4/libxml.m4 (gl_LIBXML): Define VA_COPY, needed for xmlwriter.c.
+
+2006-12-16  Bruno Haible  <bruno@clisp.org>
+
+       * lib/libxml/xmlwriter.c: Include libxml.h first, not after string.h.
+
 2006-12-13  Bruno Haible  <bruno@clisp.org>
 
        * build-aux/moopp: Add check for GNU sed. Generate the 4 files in the

diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
index afb226a032c8a18f1e7aa6fd405b35d903b7a2a4..43cec43a11b4c3e967513b48c9a58d69a89f32d6 100644 (file)
--- a/gnulib-local/m4/libxml.m4
+++ b/gnulib-local/m4/libxml.m4
@@ -1,4 +1,4 @@
-# libxml.m4 serial 2 (gettext-0.16.2)
+# libxml.m4 serial 3 (gettext-0.16.2)
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -142,8 +142,10 @@ AC_DEFUN([gl_LIBXML],
                       netinet/in.h resolv.h signal.h stdlib.h string.h \
                       strings.h sys/select.h sys/socket.h sys/stat.h \
                       sys/time.h sys/types.h time.h unistd.h])
-    AC_CHECK_FUNCS([dlopen getaddrinfo localtime shlload stat _stat strftime \
-                    va_copy __va_copy])
+    AC_CHECK_FUNCS([dlopen getaddrinfo localtime shlload stat _stat strftime])
+    dnl This relies on the va_copy replacement from the stdarg module.
+    AC_DEFINE([VA_COPY], [va_copy],
+      [Define to a working va_copy macro or replacement.])
     dnl Don't bother checking for pthread.h and other multithread facilities.
     dnl Don't bother checking for zlib.h and how to link with libz.
   else

diff --git a/gnulib-local/modules/libxml b/gnulib-local/modules/libxml
index 690dc7f923fdd8807fd690560c7971dbdaf32afe..d248eac863e1c2077bb6d46d308e74f3491565d3 100644 (file)
--- a/gnulib-local/modules/libxml
+++ b/gnulib-local/modules/libxml
@@ -100,6 +100,7 @@ m4/absolute-header.m4
 
 Depends-on:
 iconv
+stdarg
 no-c++
 
 configure.ac: