[ros-diffs] [ros-arm-bringup] 41875: Define PAGE_SIZE in winnt.h for now, for modules that don't include the NDK, and then make the NDK and WINNT.H safe to use combined

[ros-arm-bringup at svn.reactos.org]

Author: ros-arm-bringup
Date: Sat Jul 11 16:35:29 2009
New Revision: 41875

URL: http://svn.reactos.org/svn/reactos?rev=41875&view=rev
Log:
Define PAGE_SIZE in winnt.h for now, for modules that don't include the NDK, and then make the NDK and WINNT.H safe to use combined

Modified:
    trunk/reactos/include/ndk/arm/mmtypes.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/ndk/arm/mmtypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?rev=41875&r1=41874&r2=41875&view=diff
==============================================================================
--- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Sat Jul 11 16:35:29 2009
@@ -26,7 +26,9 @@
 //
 // Page-related Macros
 //
+#ifndef PAGE_SIZE
 #define PAGE_SIZE                         0x1000
+#endif
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=41875&r1=41874&r2=41875&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 11 16:35:29 2009
@@ -2846,6 +2846,10 @@
 } CONTEXT;
 #elif defined(ARM)
 
+#ifndef PAGE_SIZE
+#define PAGE_SIZE                         0x1000 // FIXME: This should probably go elsewhere
+#endif
+    
 /* The following flags control the contents of the CONTEXT structure. */
 
 #define CONTEXT_ARM    0x0000040