Author: sir_richard Date: Tue Feb 9 04:05:49 2010 New Revision: 45525
URL: http://svn.reactos.org/svn/reactos?rev=45525&view=rev Log: [MISC]: Build fixes to sync up with latest changes. [SETUPLDR]: Do not build on ARM. On a side note, I offer a bountry for "if ARCH != ARM" support in .rbuild files, instead of only allowing ==.
Modified: trunk/reactos/boot/freeldr/freeldr.rbuild trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h
Modified: trunk/reactos/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr.rbuild... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -10,8 +10,18 @@ <xi:include href="freeldr/freeldr_base.rbuild" /> <xi:include href="freeldr/freeldr_arch.rbuild" /> <xi:include href="freeldr/freeldr_main.rbuild" /> - <xi:include href="freeldr/setupldr_main.rbuild" /> <xi:include href="freeldr/freeldr.rbuild" /> - <xi:include href="freeldr/setupldr.rbuild" /> + <if property="ARCH" value="i386"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> + <if property="ARCH" value="ppc"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> + <if property="ARCH" value="amd64"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> </directory> </group>
Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk.... ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -122,9 +122,7 @@ // Processor Control Region // #ifdef _WINNT_H -typedef -VOID -(*PKINTERRUPT_ROUTINE)(VOID); +#define KIRQL ULONG #endif typedef struct _KPCR {
Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/a... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -111,12 +111,12 @@
#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) -#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Access = 1) // FIXFIX -#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ExtendedAccess = 1) // FIXFIX +#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ReadOnly = 0) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) -#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ExtendedAccess == 0) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) #define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE #define MI_IS_PAGE_DIRTY(x) TRUE