added missing NOP_FUNTION macro to ntdef.h, adjusted the existing one in
winnt.h for _MSC_VER

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4893 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ntdef.h

diff --git a/mingw-w64-headers/include/ntdef.h b/mingw-w64-headers/include/ntdef.h
index 01ddc4c..3c68d52 100644
--- a/mingw-w64-headers/include/ntdef.h
+++ b/mingw-w64-headers/include/ntdef.h
@@ -171,6 +171,14 @@
 #define NTAPI __stdcall
 
 
+#ifndef NOP_FUNCTION
+#if (_MSC_VER >= 1210)
+#define NOP_FUNCTION __noop
+#else
+#define NOP_FUNCTION (void)0
+#endif
+#endif
+
 /* Import and Export Specifiers */
 
 /* Done the same way as in windef.h for now */

mingw-w64-headers/include/winnt.h

diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index a3c70a4..e1a95c0 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -133,8 +133,12 @@
 #endif
 
 #ifndef NOP_FUNCTION
+#if (_MSC_VER >= 1210)
+#define NOP_FUNCTION __noop
+#else
 #define NOP_FUNCTION (void)0
 #endif
+#endif
 
 #ifndef DECLSPEC_NOINLINE
 #if (_MSC_VER >= 1300)