diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-08 10:41:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-08 10:41:30 +0100 |
| commit | e792933ce1a9229d01b00f02caa39c39c30bcce8 (patch) | |
| tree | cbfd5992ed7c360c110e5fda9525dc7439369b87 | |
| parent | 55519a4b244e4822774b593e36647ecf7598286b (diff) | |
| parent | 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5 (diff) | |
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging
* remotes/mdroth/qga-pull-2014-4-7:
vss-win32: Fix build with mingw64-headers-3.1.0
Makefile: add qga-vss-dll-obj-y to nested variables
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | qga/vss-win32/install.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -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 b791a6c33..b0e4426c7 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) |