From c59095903afc94a888e11c2ce098d3e959a2affe Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 12 Mar 2012 21:27:15 +0000 Subject: [PATCH] [DDK/PSDK] Put NOP_FUNCTION where it belongs! svn path=/trunk/; revision=56135 --- reactos/include/ddk/wdm.h | 10 ---------- reactos/include/psdk/ntdef.h | 8 ++++++++ reactos/include/psdk/winnt.h | 8 ++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index de1cd7a99be..47633523e98 100644 --- 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) diff --git a/reactos/include/psdk/ntdef.h b/reactos/include/psdk/ntdef.h index d301bdb18bc..a88a7759dc7 100644 --- a/reactos/include/psdk/ntdef.h +++ b/reactos/include/psdk/ntdef.h @@ -237,6 +237,14 @@ #endif #endif /* DECLSPEC_ADDRSAFE */ +#ifndef NOP_FUNCTION +#if (_MSC_VER >= 1210) +#define NOP_FUNCTION __noop +#else +#define NOP_FUNCTION (void)0 +#endif +#endif + #if !defined(_NTSYSTEM_) #define NTSYSAPI DECLSPEC_IMPORT #define NTSYSCALLAPI DECLSPEC_IMPORT diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 1e669ab3b73..b7bfef7fd2f 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -81,6 +81,14 @@ # endif #endif +#ifndef NOP_FUNCTION +#if (_MSC_VER >= 1210) +#define NOP_FUNCTION __noop +#else +#define NOP_FUNCTION (void)0 +#endif +#endif + # define DECLSPEC_HIDDEN #ifdef __cplusplus