diff options
author | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
commit | b5a2c971202ff19079cb5a98253d8760ae124d15 (patch) | |
tree | 451469af3bf1c7d9ce0236ba546867bbf6a2fb3a /X11/Xwindows.h | |
parent | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (diff) | |
parent | d435b20322433b335a4fc5693cce0399a3f27b2d (diff) | |
download | vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.gz vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.bz2 vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xwindows.h
Diffstat (limited to 'X11/Xwindows.h')
-rwxr-xr-x[-rw-r--r--] | X11/Xwindows.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/X11/Xwindows.h b/X11/Xwindows.h index 92b8b527b..906815aca 100644..100755 --- a/X11/Xwindows.h +++ b/X11/Xwindows.h @@ -63,6 +63,10 @@ The Open Group. #define _NO_BOOL_TYPEDEF #define BOOL WINBOOL #define INT32 wINT32 +#ifdef __x86_64__ +#define INT64 wINT64 +#define LONG64 wLONG64 +#endif #ifdef Status #undef Status #endif @@ -77,6 +81,8 @@ typedef int Status; #undef BYTE #undef BOOL #undef INT32 +#undef INT64 +#undef LONG64 #undef ATOM #undef FreeResource #undef CreateWindowA |