diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index fe299d9..8c077c9 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	"4831"
+#define __MINGW_W64_REV	"4834"
 #define __MINGW_W64_REV_STAMP "2012-02-24"
 
diff --git a/mingw-w64-headers/ddk/include/ddk/ndis.h b/mingw-w64-headers/ddk/include/ddk/ndis.h
index 95edf4c..7dabad5 100644
--- a/mingw-w64-headers/ddk/include/ddk/ndis.h
+++ b/mingw-w64-headers/ddk/include/ddk/ndis.h
@@ -3061,19 +3061,19 @@
 #define NdisChainBufferAtBack(Packet,           \
                               Buffer)           \
 {                                               \
-  PNDIS_BUFFER NdisBuffer = (Buffer);           \
+  PNDIS_BUFFER _NdisBuffer = (Buffer);          \
                                                 \
-  while (NdisBuffer->Next != NULL)              \
-    NdisBuffer = NdisBuffer->Next;              \
+  while (_NdisBuffer->Next != NULL)             \
+    _NdisBuffer = _NdisBuffer->Next;            \
                                                 \
-  NdisBuffer->Next = NULL;                      \
+  _NdisBuffer->Next = NULL;                     \
                                                 \
   if ((Packet)->Private.Head != NULL)           \
     (Packet)->Private.Tail->Next = (Buffer);    \
   else                                          \
     (Packet)->Private.Head = (Buffer);          \
                                                 \
-  (Packet)->Private.Tail = NdisBuffer;          \
+  (Packet)->Private.Tail = _NdisBuffer;         \
   (Packet)->Private.ValidCounts = FALSE;        \
 }