Signed-off-by: Martin Storsjö <mar...@martin.st>
---
 mingw-w64-headers/crt/setjmp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-headers/crt/setjmp.h b/mingw-w64-headers/crt/setjmp.h
index 804d9af..db9ee7f 100644
--- a/mingw-w64-headers/crt/setjmp.h
+++ b/mingw-w64-headers/crt/setjmp.h
@@ -202,7 +202,7 @@ extern "C" {
 
 void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void);
 
-#ifndef USE_NO_MINGW_SETJMP_TWO_ARGS
+#if !defined(USE_NO_MINGW_SETJMP_TWO_ARGS) && __MSVCRT_VERSION__ < 0x1400
 #  ifndef _INC_SETJMPEX
 #    if defined(_X86_) || defined(__i386__)
 #      define setjmp(BUF) _setjmp3((BUF), NULL)
@@ -234,7 +234,7 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp 
(void);
 
 #else
 
-#  ifndef _INC_SETJMPEX
+#  if !defined(_INC_SETJMPEX) && __MSVCRT_VERSION__ < 0x1400
 #    define setjmp _setjmp
 #  endif
 
-- 
2.7.4


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to