falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tomoki Sekiyama 2014-03-26 14:28:51 -04:00 committed by Michael Roth
parent 577a67234d
commit 9854202b57
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qga/vss-win32/install.cpp
View File

@ -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) #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) void __stdcall _com_issue_error(HRESULT hr)
{ {
errmsg(hr, "Unexpected error in COM"); errmsg(hr, "Unexpected error in COM");
} }
#endif
template<class T> template<class T>
HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val) HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val)