| commit | 2d2e626623d3ee684a2926e68c0a23b618592111 | |
| author | sezero <sezero@4407c894-4637-0410-b4f5-ada5f102cad1> | |
| Wed, 1 Aug 2012 12:20:49 +0000 (1 12:20 +0000) | ||
| committer | sezero <sezero@4407c894-4637-0410-b4f5-ada5f102cad1> | |
| Wed, 1 Aug 2012 12:20:49 +0000 (1 12:20 +0000) | ||
| tree | 8a19deec67d767c78e4b26e5360169ba8ce99948 | treesnapshot (tar.gz zip) |
| parent | cbcc411c6fe392cd3a76d41c17ba12d933c791ae | 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/v2.x@5306 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/v2.x@5306 4407c894-4637-0410-b4f5-ada5f102cad1