diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 15:50:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 15:55:34 +0100 |
| commit | 75d5f3d07b26c8e311e355a7d6bebbaf388949a3 (patch) | |
| tree | ddcc16e28a40833387e572000c651dc1541a3757 | |
| parent | d1d04c7bd3f1465b7bb6690022d086c6bb005b70 (diff) | |
| download | vcxsrv-75d5f3d07b26c8e311e355a7d6bebbaf388949a3.tar.gz vcxsrv-75d5f3d07b26c8e311e355a7d6bebbaf388949a3.tar.bz2 vcxsrv-75d5f3d07b26c8e311e355a7d6bebbaf388949a3.zip | |
Solved compilation error due to name conflict
| -rw-r--r-- | libX11/src/CrWindow.c | 4 | ||||
| -rw-r--r-- | libX11/src/Window.c | 4 |
2 files changed, 8 insertions, 0 deletions
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, |