tree 2c19fa9e382b68aa45dff2303c54864cd05a4c77
parent a273e5b39e62430326b7e54ab07831ddf7a8bfab
author Ozkan Sezer <sezeroz@gmail.com> 1343823620 +0000
committer Ozkan Sezer <sezeroz@gmail.com> 1343823620 +0000

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: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v1.x@5305 4407c894-4637-0410-b4f5-ada5f102cad1