From 577a67234dd7bef8b0443804f3a81977072f8657 Mon Sep 17 00:00:00 2001 From: Tomoki Sekiyama Date: Wed, 26 Mar 2014 14:28:45 -0400 Subject: Makefile: add qga-vss-dll-obj-y to nested variables The build rule for qga/vss-win32/qga-vss.dll is broken by commit ba1183da9a10b94611cad88c44a5c6df005f9b55, because it misses qga-vss-dll-obj-y in the list of nested variables. This fixes build of qga-vss.dll by adding qga-vss-dll-obj-y to the list. Signed-off-by: Tomoki Sekiyama Signed-off-by: Michael Roth --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d622799554..423e373fed 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ dummy := $(call unnest-vars,, \ stub-obj-y \ util-obj-y \ qga-obj-y \ + qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ common-obj-y \ -- cgit v1.2.1 From 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5 Mon Sep 17 00:00:00 2001 From: Tomoki Sekiyama Date: Wed, 26 Mar 2014 14:28:51 -0400 Subject: vss-win32: Fix build with mingw64-headers-3.1.0 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 Signed-off-by: Michael Roth --- 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 b791a6c33b..b0e4426c72 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 HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val) -- cgit v1.2.1