diff options
| author | Tomoki Sekiyama | 2014-03-26 19:28:51 +0100 |
|---|---|---|
| committer | Michael Roth | 2014-04-07 21:39:19 +0200 |
| commit | 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5 (patch) | |
| tree | cbfd5992ed7c360c110e5fda9525dc7439369b87 /qga | |
| parent | Makefile: add qga-vss-dll-obj-y to nested variables (diff) | |
| download | qemu-9854202b57e0ac197cf2bee3d7fbf79ba58f16c5.tar.gz qemu-9854202b57e0ac197cf2bee3d7fbf79ba58f16c5.tar.xz qemu-9854202b57e0ac197cf2bee3d7fbf79ba58f16c5.zip | |
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 <tomoki.sekiyama@hds.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/vss-win32/install.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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<class T> HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val) |