Merge MSVC fixes from cmake branch

[reactos.git] / reactos / include / crt / _mingw.h

diff --git a/reactos/include/crt/_mingw.h b/reactos/include/crt/_mingw.h
index b35b6af..d952d1d 100644 (file)
--- a/reactos/include/crt/_mingw.h
+++ b/reactos/include/crt/_mingw.h
@@ -187,7 +187,7 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case.  */
 #endif
 #endif
 
-#ifdef _WIN64
+#if defined(_WIN64) && !defined(_MSC_VER)
 #undef USE_MINGW_SETJMP_TWO_ARGS
 #define USE_MINGW_SETJMP_TWO_ARGS
 #endif