tree 8a19deec67d767c78e4b26e5360169ba8ce99948
parent 32bc3b51e7e30301fd6cec9f47bb668240d51afa
author Ozkan Sezer <sezeroz@gmail.com> 1343823649 +0000
committer Ozkan Sezer <sezeroz@gmail.com> 1343823649 +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/v2.x@5306 4407c894-4637-0410-b4f5-ada5f102cad1