[tkreuzer] 56135: [DDK/PSDK] Put NOP_FUNCTION where it belongs!

Author: tkreuzer
Date: Mon Mar 12 21:27:15 2012
New Revision: 56135

URL: http://svn.reactos.org/svn/reactos?rev=56135&view=rev
Log:
[DDK/PSDK]
Put NOP_FUNCTION where it belongs!

Modified:
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/include/psdk/ntdef.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=56135...
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Mar 12 21:27:15 2012
@@ -128,16 +128,6 @@
 #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)

Modified: trunk/reactos/include/psdk/ntdef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=56...
==============================================================================
--- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Mar 12 21:27:15 2012
@@ -236,6 +236,14 @@
 #define DECLSPEC_ADDRSAFE
 #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

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=56...
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Mar 12 21:27:15 2012
@@ -79,6 +79,14 @@
 # else
 #  define DECLSPEC_ALIGN(x)
 # endif
+#endif
+
+#ifndef NOP_FUNCTION
+#if (_MSC_VER >= 1210)
+#define NOP_FUNCTION __noop
+#else
+#define NOP_FUNCTION (void)0
+#endif
 #endif

# define DECLSPEC_HIDDEN