From 75d5f3d07b26c8e311e355a7d6bebbaf388949a3 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Dec 2011 15:50:42 +0100 Subject: Solved compilation error due to name conflict --- libX11/src/CrWindow.c | 4 ++++ libX11/src/Window.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libX11/src/CrWindow.c b/libX11/src/CrWindow.c index 23f7ddce0..347e9a022 100644 --- a/libX11/src/CrWindow.c +++ b/libX11/src/CrWindow.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. #endif #include "Xlibint.h" +#ifdef _MSC_VER +#undef CreateWindow +#endif + Window XCreateSimpleWindow( register Display *dpy, Window parent, diff --git a/libX11/src/Window.c b/libX11/src/Window.c index 85a28f372..341efee0f 100644 --- a/libX11/src/Window.c +++ b/libX11/src/Window.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. #endif #include "Xlibint.h" +#ifdef _MSC_VER +#undef CreateWindow +#endif + void _XProcessWindowAttributes ( register Display *dpy, xChangeWindowAttributesReq *req, -- cgit v1.2.3