diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 07:53:41 +0100 |
| commit | 1738a6973deb03f33a71c9527594727cb8bb64b4 (patch) | |
| tree | 813603d381b5536ef7a1e2ffd3a137c4bc0623f7 /xorg-server/hw/xwin/winms.h | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.gz vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.tar.bz2 vcxsrv-1738a6973deb03f33a71c9527594727cb8bb64b4.zip | |
xserver mesa xkbcomp git update 7 nov 2012
xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834
Diffstat (limited to 'xorg-server/hw/xwin/winms.h')
| -rw-r--r-- | xorg-server/hw/xwin/winms.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/winms.h b/xorg-server/hw/xwin/winms.h index 4355baeb8..5282fc982 100644 --- a/xorg-server/hw/xwin/winms.h +++ b/xorg-server/hw/xwin/winms.h @@ -42,7 +42,11 @@ #include <X11/Xwindows.h> #include <windowsx.h> +#pragma push_macro("Status") +#undef Status +#define Status wStatus #include "ddraw.h" +#pragma pop_macro("Status") #undef CreateWindow |