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
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index d65009d..1791169 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
/* Do not edit. Autogenerated. */
-#define __MINGW_W64_REV "5213"
-#define __MINGW_W64_REV_STAMP "2012-07-11"
+#define __MINGW_W64_REV "5305"
+#define __MINGW_W64_REV_STAMP "2012-08-01"
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 23af7a8..6ccace7 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-01 Ozkan Sezer <sezeroz@gmail.com>
+
+ Merge from trunk rev. 5245:
+ Kai Tietz <ktietz@redhat.com>
+ * msxml.h, msxml2.h: Make abort agnostic against user-defines.
+
+ Merge from trunk rev. 5236:
+ Corinna Vinschen <vinschen@redhat.com>
+ * usb.h: Check for _WIN64 instead of WIN64.
+
2012-07-11 Ozkan Sezer <sezeroz@gmail.com>
* tapi.h: Move the unicode A/W macros after the function prototypes.
diff --git a/mingw-w64-headers/include/msxml.h b/mingw-w64-headers/include/msxml.h
index 00b4690..cf8e471 100644
--- a/mingw-w64-headers/include/msxml.h
+++ b/mingw-w64-headers/include/msxml.h
@@ -10,6 +10,9 @@
#include "rpc.h"
#include "rpcndr.h"
+#pragma push_macro("abort")
+#undef abort
+
#ifndef __msxml_h__
#define __msxml_h__
@@ -3377,4 +3380,7 @@
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __msxml_h__ */
+
+#pragma pop_macro("abort")
diff --git a/mingw-w64-headers/include/msxml2.h b/mingw-w64-headers/include/msxml2.h
index ce200ea..f76898a 100644
--- a/mingw-w64-headers/include/msxml2.h
+++ b/mingw-w64-headers/include/msxml2.h
@@ -10,6 +10,9 @@
#include "rpc.h"
#include "rpcndr.h"
+#pragma push_macro("abort")
+#undef abort
+
#ifndef __msxml2_h__
#define __msxml2_h__
@@ -7803,3 +7806,5 @@
}
#endif
#endif
+
+#pragma pop_macro("abort")
diff --git a/mingw-w64-headers/include/usb.h b/mingw-w64-headers/include/usb.h
index 18d03dd..df9c17e 100644
--- a/mingw-w64-headers/include/usb.h
+++ b/mingw-w64-headers/include/usb.h
@@ -476,7 +476,7 @@
PVOID TransferBuffer;
PMDL TransferBufferMDL;
ULONG Timeout;
-#ifdef WIN64
+#ifdef _WIN64
ULONG Pad;
#endif
struct _URB_HCD_AREA hca;
