| commit | f6ff7af9f89869da338b22cf632b2a367dfbb42e | |
| author | sezero <sezero@4407c894-4637-0410-b4f5-ada5f102cad1> | |
| Wed, 1 Aug 2012 12:20:20 +0000 (1 12:20 +0000) | ||
| committer | sezero <sezero@4407c894-4637-0410-b4f5-ada5f102cad1> | |
| Wed, 1 Aug 2012 12:20:20 +0000 (1 12:20 +0000) | ||
| tree | 2c19fa9e382b68aa45dff2303c54864cd05a4c77 | treesnapshot (tar.gz zip) |
| parent | 1cac2ba84b92fc6601f7858b565849652ef20e34 | commitdiff |
Merge from trunk rev. 5245:
* msxml.h, msxml2.h: Make abort agnostic against user-defines.
Merge from trunk rev. 5236:
* usb.h: Check for _WIN64 instead of WIN64.
git-svn-id: http://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/stable/v1.x@5305 4407c894-4637-0410-b4f5-ada5f102cad1
* msxml.h, msxml2.h: Make abort agnostic against user-defines.
Merge from trunk rev. 5236:
* usb.h: Check for _WIN64 instead of WIN64.
git-svn-id: http://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/stable/v1.x@5305 4407c894-4637-0410-b4f5-ada5f102cad1