merge from trunk rev. 5148: 2012-06-28 Corinna Vinschen <vinschen@redhat.com> * ntdef.h (PHYSICAL_ADDRESS): Define unconditionally. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5152 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index 38ab413..c334518 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	"5144"
+#define __MINGW_W64_REV	"5152"
 #define __MINGW_W64_REV_STAMP "2012-06-28"
 

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index c5b6a60..420ad7a 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog

@@ -1,3 +1,7 @@
+2012-06-28  Corinna Vinschen  <vinschen@redhat.com>
+
+	* ntdef.h (PHYSICAL_ADDRESS): Define unconditionally.
+
 2012-06-27  Corinna Vinschen  <vinschen@redhat.com>
 
 	* include/stralign.h: Fix and add #endif comments.

diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h
index 3c68d52..892e395 100644
--- a/mingw-w64-headers/include/ntdef.h
+++ b/mingw-w64-headers/include/ntdef.h

@@ -421,9 +421,6 @@
   ULONGLONG QuadPart;
 } ULARGE_INTEGER, *PULARGE_INTEGER;
 
-/* Physical Addresses are always treated as 64-bit wide */
-typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
-
 /* Locally Unique Identifier */
 typedef struct _LUID {
   ULONG LowPart;
@@ -432,6 +429,9 @@
 
 #endif /* _LARGE_INTEGER_DEFINED */
 
+/* Physical Addresses are always treated as 64-bit wide */
+typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
+
 /* Native API Return Value Macros */
 #define NT_SUCCESS(Status)              (((NTSTATUS)(Status)) >= 0)
 #define NT_INFORMATION(Status)          ((((ULONG)(Status)) >> 30) == 1)