Fix build on Visual C++

-glib/gmarkup.c: Use G_VA_COPY() instead of va_copy() as va_copy() may not
 be universally available.
-gio/gtestdbus.c: Include io.h on Windows for close()

diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c
index 197b2d8..e80c6e1 100644 (file)
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.c
@@ -30,6 +30,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 #include <glib.h>
 

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 4fda725..86e60bb 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -2580,7 +2580,7 @@ _g_markup_collect_attributesv (const gchar         *element_name,
 
   /* Take a copy of the va_list so that we can iterate back over it in case of
    * errors. */
-  va_copy (ap2, ap);
+  G_VA_COPY (ap2, ap);
 
   while (type != G_MARKUP_COLLECT_INVALID)
     {