Author: tkreuzer Date: Thu Oct 29 22:49:28 2009 New Revision: 43835
URL: http://svn.reactos.org/svn/reactos?rev=43835&view=rev Log: Fix merge artifact, spotted by encoded
Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h
Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Oct 29 22:49:28 2009 @@ -627,23 +627,19 @@ #if (NTDDI_VERSION >= NTDDI_WS03) union { - BOOLEAN ImageUsesLargePages:1; BOOLEAN BitField; struct { UCHAR ImageUsesLargePages:1; - #if (NTDDI_VERSION >= NTDDI_LONGHORN) - BOOLEAN IsProtectedProcess:1; - BOOLEAN IsLegacyProcess:1; - BOOLEAN SpareBits:5; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) BOOLEAN IsProtectedProcess:1; BOOLEAN IsLegacyProcess:1; BOOLEAN IsImageDynamicallyRelocated:1; BOOLEAN SkipPatchingUser32Forwarders:1; BOOLEAN SpareBits:3; - #else +#else BOOLEAN SpareBits:7; - #endif +#endif }; }; #else