diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
| commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
| tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /X11/Xwindows.h | |
| parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
| parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
| download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/Xwindows.h')
| -rw-r--r-- | X11/Xwindows.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/X11/Xwindows.h b/X11/Xwindows.h index 6318155e1..5a0a2fbb9 100644 --- a/X11/Xwindows.h +++ b/X11/Xwindows.h @@ -52,7 +52,9 @@ The Open Group. #define NOMINMAX #define BOOL wBOOL #define INT32 wINT32 +#ifdef Status #undef Status +#endif #define Status wStatus #define ATOM wATOM #define BYTE wBYTE @@ -60,7 +62,7 @@ The Open Group. #include <windows.h> #undef NOMINMAX #undef Status -#define Status int +typedef int Status; #undef BYTE #undef BOOL #undef INT32 |