From 11c1cbcb23f405ec8717fcb46c31b8acdfef8eb6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 3 Apr 2025 11:27:06 +0200 Subject: [PATCH] (1889) xwin: fix name clash between Xserver and Windows headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > ../hw/xwin/winscrinit.c: In function ‘winFinishScreenInitFB’: > ../hw/xwin/winscrinit.c:381:18: error: ‘struct _Screen’ has no member named ‘CreateWindowA’; did you mean ‘CreateWindow’? > 381 | pScreen->CreateWindow = winCreateWindowRootless; > | ^~~~~~~~~~~~ > ../hw/xwin/winscrinit.c:405:18: error: ‘struct _Screen’ has no member named ‘CreateWindowA’; did you mean ‘CreateWindow’? > 405 | pScreen->CreateWindow = winCreateWindowMultiWindow; > | ^~~~~~~~~~~~ Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xwin/winscrinit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 65820db8f..e5e3f0d29 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -41,6 +41,10 @@ #include "win.h" #include "winmsg.h" +// workaround for win32/mingw32 name clash: +// windows headers #define CreateWindow to CreateWindowA +#undef CreateWindow + static Bool winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv); /*