diff --git a/Makefile b/Makefile index d6227995548c15abfefa4ffcc54ddb2fbda1e8ba..423e373fed3e13e4ed555926e76b503e20065745 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 \ diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index b791a6c33b0a9022a443102ff30133dd741598ed..b0e4426c72dd22ed3b89b8d62f36b42caa9c8365 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)