diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 378c85b..f8e0c4f 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-28  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* strsafe.h: Apply the same C_ASSERT macro fix in winnt.h.
+
 2010-06-27  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* ks.h (KSATTRIBUTE_LIST): Added for DDK.
diff --git a/mingw-w64-headers/include/strsafe.h b/mingw-w64-headers/include/strsafe.h
index df9c112..3199dc3 100644
--- a/mingw-w64-headers/include/strsafe.h
+++ b/mingw-w64-headers/include/strsafe.h
@@ -55,8 +55,12 @@
 #endif
 
 #ifndef C_ASSERT
-#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
+#ifdef _MSC_VER
+# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
+#else
+# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1])
 #endif
+#endif /* C_ASSERT */
 
 #ifdef __cplusplus
 #define _STRSAFE_EXTERN_C extern "C"