diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-08-11 12:15:11 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-08-30 12:52:24 +0100 |
| commit | b27756dbe6a1be4633ec47a8fe92a4c217f68f93 (patch) | |
| tree | 39eb79985bd0210fd57129792c876cc2dbf47056 /hw/xwin/InitOutput.c | |
| parent | e01a3f65d3e6d92f92ef2992b338cc9625bde082 (diff) | |
hw/xwin: Fix inclusion of shlobj.h in MinGW64 build
Fix build with latest MinGW64 headers by wrapping Status type in shlobj.h as well
In file included from InitOutput.c:51:0:
/usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1231:44: error: expected identifier or ‘(’ before ‘int’
/usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1248:44: error: expected identifier or ‘(’ before ‘int’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
Diffstat (limited to 'hw/xwin/InitOutput.c')
| -rw-r--r-- | hw/xwin/InitOutput.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index d6b5e4fd9..b05ca2736 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -48,7 +48,11 @@ from The Open Group. #include "xkbsrv.h" #endif #ifdef RELOCATE_PROJECTROOT +#pragma push_macro("Status") +#undef Status +#define Status wStatus #include <shlobj.h> +#pragma pop_macro("Status") typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner, int nFolder, HANDLE hToken, |