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>
This commit is contained in:
parent
e01a3f65d3
commit
b27756dbe6
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue
Block a user