[RTL/NDK/DDK/XDK]

[reactos.git] / reactos / include / ddk / wdm.h

diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index de1cd7a..041e8ff 100644 (file)
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -128,16 +128,6 @@ extern "C" {
 #define ALLOC_DATA_PRAGMA 1
 #endif
 
-/* Add NOP_FUNCTION support */
-#ifndef NOP_FUNCTION && (_MSC_VER >= 1210)
-#define NOP_FUNCTION __noop
-#else
-#define NOP_FUNCTION (void)0
-#endif
-#else
-#ifndef NOP_FUNCTION
-#define NOP_FUNCTION (void)0
-#endif
 #endif
 
 #if defined(_WIN64)
@@ -1043,7 +1033,7 @@ typedef struct _KWAIT_BLOCK {
   struct _KWAIT_BLOCK *NextWaitBlock;
   USHORT WaitKey;
   UCHAR WaitType;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#if (NTDDI_VERSION >= NTDDI_WIN7)
   volatile UCHAR BlockState;
 #else
   UCHAR SpareByte;
@@ -1416,9 +1406,9 @@ typedef struct _KTIMER {
   ULARGE_INTEGER DueTime;
   LIST_ENTRY TimerListEntry;
   struct _KDPC *Dpc;
-# if !defined(_X86_)
+#if (NTDDI_VERSION >= NTDDI_WIN7) && !defined(_X86_)
   ULONG Processor;
-# endif
+#endif
   ULONG Period;
 } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER;
 
@@ -8074,7 +8064,7 @@ RtlCopyMemoryNonTemporal(
 #define RtlEqualLuid(Luid1, Luid2) \
     (((Luid1)->LowPart == (Luid2)->LowPart) && ((Luid1)->HighPart == (Luid2)->HighPart))
 
-/* ULONG
+/* LOGICAL
  * RtlEqualMemory(
  *     IN VOID UNALIGNED *Destination,
  *     IN CONST VOID UNALIGNED *Source,