fixed DBUS_VA_COPY for msvc

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index d4b2629499d2ce799b42c5bff228eb42fbb6cbb3..33a0a760c623ea9eecaf8dada1161853205b6cbc 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -52,6 +52,14 @@ find_package(X11)
 
 OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON)
 
+if (MINGW)
+    set (DBUS_VA_COPY_AS_ARRAY 1)
+endif (MINGW)
+if (MSVC)
+    set (DBUS_HAVE_VA_COPY 1)
+    set (DBUS_VA_COPY_AS_ARRAY 0)
+endif (MSVC)
+
 # do config checks
 INCLUDE(ConfigureChecks.cmake)
 

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 3461338d81a27d82701c91ddda83b8a7d4529cbc..d3d59baee89bb02fcebf03afeda46a65c974aec5 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -87,7 +87,7 @@
 #undef DBUS_VA_COPY_FUNC
 #endif
 
-#cmakedefine DBUS_VA_COPY_AS_ARRAY 1
+#cmakedefine DBUS_VA_COPY_AS_ARRAY @DBUS_VA_COPY_AS_ARRAY@
 
 // headers
 /* Define to 1 if you have dirent.h */