qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH for-2.0 2/2] vss-win32: Fix build with mingw64-heade


From: Michael Roth
Subject: [Qemu-devel] [PATCH for-2.0 2/2] vss-win32: Fix build with mingw64-headers-3.1.0
Date: Mon, 7 Apr 2014 15:21:31 -0500

From: Tomoki Sekiyama <address@hidden>

In mingw64-headers-3.1.0, definition of _com_issue_error() is added, which
conflicts with definition in install.cpp. This adds version checking for
mingw headers to disable the definition when the headers>=3.1 is used.

Signed-off-by: Tomoki Sekiyama <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
 qga/vss-win32/install.cpp |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index b791a6c..b0e4426 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -75,10 +75,13 @@ static void errmsg_dialog(DWORD err, const char *text, 
const char *opt = "")
 
 #define chk(status) _chk(hr, status, "Failed to " #status, out)
 
+#if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || \
+    __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301
 void __stdcall _com_issue_error(HRESULT hr)
 {
     errmsg(hr, "Unexpected error in COM");
 }
+#endif
 
 template<class T>
 HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val)
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]