From bb4b0aa51bc361188ffeee55ee49c7878c067903 Mon Sep 17 00:00:00 2001
From: Tim Golden <mail@timgolden.me.uk>
Date: Sun, 27 Oct 2013 20:04:12 +0000
Subject: Issue 15792 Correct build options on Win64. Patch by Jeremy Kloth.

---
 Misc/NEWS            | 2 ++
 PC/VS9.0/x64.vsprops | 2 +-
 PCbuild/x64.props    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 07aff2b..5524efa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -129,6 +129,8 @@ Build
 - Issue #19356: Avoid using a C variabled named "_self", it's a reserved
   word in some C compilers.
 
+- Issue #15792: Correct build options on Win64. Patch by Jeremy Kloth.
+
 Tools/Demos
 -----------
 
diff --git a/PC/VS9.0/x64.vsprops b/PC/VS9.0/x64.vsprops
index 9f88d44..d06f470 100644
--- a/PC/VS9.0/x64.vsprops
+++ b/PC/VS9.0/x64.vsprops
@@ -8,7 +8,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalOptions="/USECL:MS_OPTERON /GS-"
+		AdditionalOptions="/GS-"
 		PreprocessorDefinitions="_WIN64;_M_X64"
 	/>
 	<Tool
diff --git a/PCbuild/x64.props b/PCbuild/x64.props
index 289d95b..985c0ef 100644
--- a/PCbuild/x64.props
+++ b/PCbuild/x64.props
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <PreprocessorDefinitions>_WIN64;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-- 
cgit v0.12