From 8d43c73a0c4055f3d80dbfda7d97870034947039 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 20 Sep 2015 17:06:35 -0600
Subject: [PATCH] windows: use same scheme_setjmp() protocol with all compilers

---
 racket/src/racket/sconfig.h                  |  4 +---
 racket/src/worksp/libracket/libracket.vcproj | 13 +++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/racket/src/racket/sconfig.h b/racket/src/racket/sconfig.h
index 87eca16d2b..2c4455743d 100644
--- a/racket/src/racket/sconfig.h
+++ b/racket/src/racket/sconfig.h
@@ -658,9 +658,7 @@
 # define DO_STACK_CHECK
 # define WINDOWS_FIND_STACK_BOUNDS
 
-# if !defined(_WIN64) || (_MSC_VER >= 1600) || defined(__MINGW32__)
-#  define USE_MZ_SETJMP
-# endif
+# define USE_MZ_SETJMP
 
 # define WINDOWS_DYNAMIC_LOAD
 
diff --git a/racket/src/worksp/libracket/libracket.vcproj b/racket/src/worksp/libracket/libracket.vcproj
index 65c58ca59a..6fba1d13fa 100644
--- a/racket/src/worksp/libracket/libracket.vcproj
+++ b/racket/src/worksp/libracket/libracket.vcproj
@@ -503,6 +503,19 @@
 				RelativePath="..\..\racket\src\mzsj86.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\racket\src\mzsj86w64.S"
+				>
+				<FileConfiguration
+					Name="SRelease|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="ml64.exe /c /Cx /Fo $(PlatformName)\$(ConfigurationName)\mzsj86w64.obj ..\..\racket\src\mzsj86w64.S"
+						Outputs=" $(PlatformName)\$(ConfigurationName)\mzsj86w64.obj"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\racket\src\network.c"
 				>