diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index ffc572b..c1c4d6a 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
 /* Do not edit. Autogenerated.  */
-#define __MINGW_W64_REV	"4842"
-#define __MINGW_W64_REV_STAMP "2012-02-27"
+#define __MINGW_W64_REV	"4892"
+#define __MINGW_W64_REV_STAMP "2012-03-09"
 
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 */
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)